diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 16:30:43 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 16:38:36 +0400 |
| commit | 8334850a9985dde0e11227902fb007b382aa97e6 (patch) | |
| tree | 1d3e645a286dc2bc3280146c1751b7a6ec768f74 /tests | |
| parent | 8636b11bdc6ecd7c486d3463a7dcb22b0c0a9ba7 (diff) | |
| parent | 93afb6c98df876b15e3d911a9450ad55f92080ce (diff) | |
Merge commit '93afb6c98df876b15e3d911a9450ad55f92080ce'
* commit '93afb6c98df876b15e3d911a9450ad55f92080ce':
avconv: set output avg_frame_rate when known
Conflicts:
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ref/lavf/wtv | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ref/lavf/wtv b/tests/ref/lavf/wtv index dd55af7287..b0ae7d1dbb 100644 --- a/tests/ref/lavf/wtv +++ b/tests/ref/lavf/wtv @@ -1,3 +1,3 @@ -fc6436e36e32a2c5c01f3e31df1c2cd1 *./tests/data/lavf/lavf.wtv +b74b14ee41830aed90380bf6252dcfdb *./tests/data/lavf/lavf.wtv 413696 ./tests/data/lavf/lavf.wtv ./tests/data/lavf/lavf.wtv CRC=0x71287e25 |