mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-12 19:18:44 +02: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>
4 lines
137 B
Plaintext
4 lines
137 B
Plaintext
c1142e54a176850a0c2e6cb41184f515 *./tests/data/lavf/lavf.nut
|
|
319948 ./tests/data/lavf/lavf.nut
|
|
./tests/data/lavf/lavf.nut CRC=0xec6c3c68
|