diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-03 14:13:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-03 14:13:45 +0100 |
| commit | 1885ffb03d0af28e6bac2bcc8725fa15b93f6ac9 (patch) | |
| tree | 192b6341b447e51b2121dc17509ce852fa36405b /libavcodec/options.c | |
| parent | b91fa5fcca70bdf188b757084edd444d4d8530c9 (diff) | |
| parent | 9a07c1332cfe092b57b5758f22b686ca58806c60 (diff) | |
| download | ffmpeg-1885ffb03d0af28e6bac2bcc8725fa15b93f6ac9.tar.gz | |
Merge commit '9a07c1332cfe092b57b5758f22b686ca58806c60'
* commit '9a07c1332cfe092b57b5758f22b686ca58806c60':
parser: Move Doxygen documentation to the header files
PGS subtitles: Expose forced flag
x86: PMINUB: port to cpuflags
Conflicts:
libavcodec/avcodec.h
libavcodec/pgssubdec.c
libavcodec/version.h
libavcodec/x86/ac3dsp.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/options.c')
| -rw-r--r-- | libavcodec/options.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/options.c b/libavcodec/options.c index 20e9495976..0da0db4806 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -277,7 +277,8 @@ static const AVOption subtitle_rect_options[]={ {"w", "", SROFFSET(w), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0}, {"h", "", SROFFSET(h), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0}, {"type", "", SROFFSET(type), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX, 0}, -{"forced", "", SROFFSET(forced), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, 0}, +{"flags", "", SROFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = 0}, 0, 1, 0, "flags"}, +{"forced", "", SROFFSET(flags), AV_OPT_TYPE_FLAGS, {.i64 = 0}, 0, 1, 0}, {NULL}, }; |