mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-22 14:26:52 +00:00
1e49439f04
* commit '6656370b858329ca07a60a2de954d5e90daa0206': avconv: set the "encoder" tag when transcoding Conflicts: ffmpeg.c tests/ref/lavf/mkv tests/ref/seek/lavf-mkv Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 lines
274 B
Plaintext
7 lines
274 B
Plaintext
689990a4a083bf399ebdec5187340cc9 *./tests/data/lavf/lavf.mkv
|
|
472661 ./tests/data/lavf/lavf.mkv
|
|
./tests/data/lavf/lavf.mkv CRC=0xec6c3c68
|
|
c0abeae6de6c08054887c088befe7c46 *./tests/data/lavf/lavf.mkv
|
|
320402 ./tests/data/lavf/lavf.mkv
|
|
./tests/data/lavf/lavf.mkv CRC=0xec6c3c68
|