mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-18 03:19:31 +02:00
967facb695
* qatar/master: (26 commits) adxenc: use AVCodec.encode2() adxenc: Use the AVFrame in ADXContext for coded_frame indeo4: fix out-of-bounds function call. configure: Restructure help output. configure: Internal-only components should not be command-line selectable. vorbisenc: use AVCodec.encode2() libvorbis: use AVCodec.encode2() libopencore-amrnbenc: use AVCodec.encode2() ra144enc: use AVCodec.encode2() nellymoserenc: use AVCodec.encode2() roqaudioenc: use AVCodec.encode2() libspeex: use AVCodec.encode2() libvo_amrwbenc: use AVCodec.encode2() libvo_aacenc: use AVCodec.encode2() wmaenc: use AVCodec.encode2() mpegaudioenc: use AVCodec.encode2() libmp3lame: use AVCodec.encode2() libgsmenc: use AVCodec.encode2() libfaac: use AVCodec.encode2() g726enc: use AVCodec.encode2() ... Conflicts: configure libavcodec/Makefile libavcodec/ac3enc.c libavcodec/adxenc.c libavcodec/libgsm.c libavcodec/libvorbis.c libavcodec/vorbisenc.c libavcodec/wmaenc.c tests/ref/acodec/g722 tests/ref/lavf/asf tests/ref/lavf/ffm tests/ref/lavf/mkv tests/ref/lavf/mpg tests/ref/lavf/rm tests/ref/lavf/ts tests/ref/seek/lavf_asf tests/ref/seek/lavf_ffm tests/ref/seek/lavf_mkv tests/ref/seek/lavf_mpg tests/ref/seek/lavf_rm tests/ref/seek/lavf_ts Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 lines
411 B
Plaintext
10 lines
411 B
Plaintext
855384c0cd3d0e3843d48698441c1384 *./tests/data/lavf/lavf.mpg
|
|
372736 ./tests/data/lavf/lavf.mpg
|
|
./tests/data/lavf/lavf.mpg CRC=0xf361ed74
|
|
612b686e2c035b18175ccefdacf9532c *./tests/data/lavf/lavf.mpg
|
|
387072 ./tests/data/lavf/lavf.mpg
|
|
./tests/data/lavf/lavf.mpg CRC=0x3d6ddf56
|
|
fcf2c242b41373186d43de3d5c518e5a *./tests/data/lavf/lavf.mpg
|
|
372736 ./tests/data/lavf/lavf.mpg
|
|
./tests/data/lavf/lavf.mpg CRC=0xf361ed74
|