diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-17 23:45:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-17 23:45:00 +0200 |
| commit | de2cfb744a207cc09bc961c859d7ae91cb6192b4 (patch) | |
| tree | 0a78680e2bcacd76b6b16b2d39005f74aa76ae05 /tests/ref/lavf | |
| parent | 847943bc51098dbd68301099ed132cdde0f9eabf (diff) | |
| parent | 7d7b40f48a05af4483b31cdb8b4f1808b97b1f2f (diff) | |
| download | ffmpeg-streaming-de2cfb744a207cc09bc961c859d7ae91cb6192b4.zip ffmpeg-streaming-de2cfb744a207cc09bc961c859d7ae91cb6192b4.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
pcmenc: set correct bitrate value
avprobe: don't print format entry name when only one was requested
Conflicts:
ffprobe.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/lavf')
| -rw-r--r-- | tests/ref/lavf/mov | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/ref/lavf/mov b/tests/ref/lavf/mov index 8e1c1b7..7487ff2 100644 --- a/tests/ref/lavf/mov +++ b/tests/ref/lavf/mov @@ -1,5 +1,5 @@ -d2f131b45f4696d7984288ed0263c2e3 *./tests/data/lavf/lavf.mov -367321 ./tests/data/lavf/lavf.mov +83754d7142a7770ac374f75b729a9319 *./tests/data/lavf/lavf.mov +367322 ./tests/data/lavf/lavf.mov ./tests/data/lavf/lavf.mov CRC=0x2f6a9b26 9a0b239ff596da58debcf210dece3985 *./tests/data/lavf/lavf.mov 357821 ./tests/data/lavf/lavf.mov |
