mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-22 07:20:45 +00:00
944d049eaa
* qatar/master: movenc: Write chan atom for all audio tracks in mov mode movies. mpegtsenc: use avio_open_dyn_buf(), zero pointers after freeing doc/avconv: add some details about the transcoding process. avidec: make scale and rate unsigned. avconv: check output stream recording time before each frame returned from filters avconv: split selecting input file out of transcode(). avconv: split checking for active outputs out of transcode(). avfiltergraph: make some functions static. Conflicts: ffmpeg.c libavfilter/avfiltergraph.c libavfilter/internal.h libavformat/mpegtsenc.c tests/ref/fate/acodec-alac tests/ref/fate/acodec-pcm-s16be tests/ref/fate/acodec-pcm-s24be tests/ref/fate/acodec-pcm-s32be tests/ref/fate/acodec-pcm-s8 tests/ref/lavf/mov Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 lines
548 B
Plaintext
13 lines
548 B
Plaintext
484aeef3be3eb4deef05c83bdc2dd484 *./tests/data/lavf/lavf.mov
|
|
367346 ./tests/data/lavf/lavf.mov
|
|
./tests/data/lavf/lavf.mov CRC=0x2f6a9b26
|
|
305a68397e3cdb505704841fedcdc352 *./tests/data/lavf/lavf.mov
|
|
357845 ./tests/data/lavf/lavf.mov
|
|
./tests/data/lavf/lavf.mov CRC=0x2f6a9b26
|
|
6e047bce400f2c4a840f783dee1ae030 *./tests/data/lavf/lavf.mov
|
|
367275 ./tests/data/lavf/lavf.mov
|
|
./tests/data/lavf/lavf.mov CRC=0xab307eb9
|
|
305a68397e3cdb505704841fedcdc352 *./tests/data/lavf/lavf.mov
|
|
357845 ./tests/data/lavf/lavf.mov
|
|
./tests/data/lavf/lavf.mov CRC=0x2f6a9b26
|