Revision 41d0eb1c

View differences:

cmdutils.c
38 38
#include "libavutil/parseutils.h"
39 39
#include "libavutil/pixdesc.h"
40 40
#include "libavutil/eval.h"
41
#include "libavcodec/opt.h"
41
#include "libavutil/opt.h"
42 42
#include "cmdutils.h"
43 43
#include "version.h"
44 44
#if CONFIG_NETWORK
ffmpeg.c
34 34
#include "libavformat/avformat.h"
35 35
#include "libavdevice/avdevice.h"
36 36
#include "libswscale/swscale.h"
37
#include "libavcodec/opt.h"
37
#include "libavutil/opt.h"
38 38
#include "libavcodec/audioconvert.h"
39 39
#include "libavutil/audioconvert.h"
40 40
#include "libavutil/parseutils.h"
ffplay.c
35 35
#include "libavdevice/avdevice.h"
36 36
#include "libswscale/swscale.h"
37 37
#include "libavcodec/audioconvert.h"
38
#include "libavcodec/opt.h"
38
#include "libavutil/opt.h"
39 39
#include "libavcodec/avfft.h"
40 40

  
41 41
#if CONFIG_AVFILTER
ffprobe.c
23 23

  
24 24
#include "libavformat/avformat.h"
25 25
#include "libavcodec/avcodec.h"
26
#include "libavcodec/opt.h"
26
#include "libavutil/opt.h"
27 27
#include "libavutil/pixdesc.h"
28 28
#include "libavdevice/avdevice.h"
29 29
#include "cmdutils.h"
ffserver.c
40 40
#include "libavutil/lfg.h"
41 41
#include "libavutil/random_seed.h"
42 42
#include "libavutil/parseutils.h"
43
#include "libavcodec/opt.h"
43
#include "libavutil/opt.h"
44 44
#include <stdarg.h>
45 45
#include <unistd.h>
46 46
#include <fcntl.h>
libavcodec/opt.c
64 64
    return av_opt_set_defaults2(s, mask, flags);
65 65
}
66 66
#endif
67

  
68
#if FF_API_SET_STRING_OLD
69
const AVOption *av_set_string2(void *obj, const char *name, const char *val, int alloc){
70
    const AVOption *o;
71
    if (av_set_string3(obj, name, val, alloc, &o) < 0)
72
        return NULL;
73
    return o;
74
}
75

  
76
const AVOption *av_set_string(void *obj, const char *name, const char *val){
77
    const AVOption *o;
78
    if (av_set_string3(obj, name, val, 0, &o) < 0)
79
        return NULL;
80
    return o;
81
}
82
#endif
libavcodec/opt.h
1
/*
2
 * AVOptions
3
 * copyright (c) 2005 Michael Niedermayer <michaelni@gmx.at>
4
 *
5
 * This file is part of Libav.
6
 *
7
 * Libav is free software; you can redistribute it and/or
8
 * modify it under the terms of the GNU Lesser General Public
9
 * License as published by the Free Software Foundation; either
10
 * version 2.1 of the License, or (at your option) any later version.
11
 *
12
 * Libav is distributed in the hope that it will be useful,
13
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
15
 * Lesser General Public License for more details.
16
 *
17
 * You should have received a copy of the GNU Lesser General Public
18
 * License along with Libav; if not, write to the Free Software
19
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20
 */
21

  
22
#ifndef AVCODEC_OPT_H
23
#define AVCODEC_OPT_H
24

  
25
/**
26
 * @file
27
 * AVOptions
28
 */
29

  
30
#include "libavutil/rational.h"
31
#include "avcodec.h"
32
#include "libavutil/opt.h"
33

  
34
#if FF_API_SET_STRING_OLD
35
/**
36
 * @see av_set_string2()
37
 */
38
attribute_deprecated const AVOption *av_set_string(void *obj, const char *name, const char *val);
39

  
40
/**
41
 * @return a pointer to the AVOption corresponding to the field set or
42
 * NULL if no matching AVOption exists, or if the value val is not
43
 * valid
44
 * @see av_set_string3()
45
 */
46
attribute_deprecated const AVOption *av_set_string2(void *obj, const char *name, const char *val, int alloc);
47
#endif
48

  
49
#endif /* AVCODEC_OPT_H */
libavcodec/version.h
41 41
#ifndef FF_API_PALETTE_CONTROL
42 42
#define FF_API_PALETTE_CONTROL  (LIBAVCODEC_VERSION_MAJOR < 54)
43 43
#endif
44
#ifndef FF_API_SET_STRING_OLD
45
#define FF_API_SET_STRING_OLD   (LIBAVCODEC_VERSION_MAJOR < 53)
46
#endif
47 44
#ifndef FF_API_INOFFICIAL
48 45
#define FF_API_INOFFICIAL       (LIBAVCODEC_VERSION_MAJOR < 53)
49 46
#endif
libswscale/options.c
20 20

  
21 21
#include "libavutil/avutil.h"
22 22
#include "libavutil/pixfmt.h"
23
#include "libavcodec/opt.h"
23
#include "libavutil/opt.h"
24 24
#include "swscale.h"
25 25
#include "swscale_internal.h"
26 26

  

Also available in: Unified diff