diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-07 22:32:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-07 22:58:39 +0200 |
| commit | f1b5693027d48a9e448f21595fb9247893c225cf (patch) | |
| tree | d01e1b5a8a3abe464cd5be4d86122f0818b60132 /tests/ref/lavf/ffm | |
| parent | a2b66a366d7d9d7dacc217601b5e4406624f91ea (diff) | |
| parent | 0ca36b4de76e10578e23199c2932682c0f510e31 (diff) | |
| download | ffmpeg-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 'tests/ref/lavf/ffm')
| -rw-r--r-- | tests/ref/lavf/ffm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ref/lavf/ffm b/tests/ref/lavf/ffm index b20e132b45..f9a8f6740f 100644 --- a/tests/ref/lavf/ffm +++ b/tests/ref/lavf/ffm @@ -1,3 +1,3 @@ -f9bee27ea1b6b83a06b5f9efb0a4ac1f *./tests/data/lavf/lavf.ffm +58a0235967d10543268184eea50a3b65 *./tests/data/lavf/lavf.ffm 376832 ./tests/data/lavf/lavf.ffm ./tests/data/lavf/lavf.ffm CRC=0xf361ed74 |