aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/v210enc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-09-07 22:32:59 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-07 22:58:39 +0200
commitf1b5693027d48a9e448f21595fb9247893c225cf (patch)
treed01e1b5a8a3abe464cd5be4d86122f0818b60132 /libavcodec/v210enc.c
parenta2b66a366d7d9d7dacc217601b5e4406624f91ea (diff)
parent0ca36b4de76e10578e23199c2932682c0f510e31 (diff)
downloadffmpeg-f1b5693027d48a9e448f21595fb9247893c225cf.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: Add LATM muxer v210enc: clip values according to specifications v210enc: switch to PIX_FMT_422P10 v210dec: switch to PIX_FMT_422P10 AVOptions: remove AVOption.offset <= 0 checks AVOptions: deprecate av_opt_set_defaults2 AVOptions: move doxy for av_opt_set_defaults() from opt.c to opt.h libx264: fix setting some more parameters libx264: fix setting the H.264 level libx264: add 'direct-pred' private option libx264: add 'partitions' private option Conflicts: Changelog libavcodec/Makefile libavcodec/libx264.c libavcodec/v210enc.c libavfilter/src_movie.c libavformat/version.h libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/v210enc.c')
-rw-r--r--libavcodec/v210enc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/v210enc.c b/libavcodec/v210enc.c
index 1991c8ccfe..92577ef80f 100644
--- a/libavcodec/v210enc.c
+++ b/libavcodec/v210enc.c
@@ -124,6 +124,6 @@ AVCodec ff_v210_encoder = {
.init = encode_init,
.encode = encode_frame,
.close = encode_close,
- .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV422P10, PIX_FMT_NONE},
+ .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV422P10, PIX_FMT_NONE},
.long_name = NULL_IF_CONFIG_SMALL("Uncompressed 4:2:2 10-bit"),
};