diff options
| author | Michael Niedermayer | 2012-04-24 00:19:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer | 2012-04-24 02:30:41 +0200 |
| commit | 3bbf3f7e42247b7a8b34b1e8cc891b59e1327bb8 (patch) | |
| tree | bf3b0776b76e0f5c4c331d9d069f16e3c0236a9c /tests | |
| parent | 2e8f19d26f3ef7e804a7f9f9811e4b538e0a5969 (diff) | |
| parent | 7521c4bab28ff3a622171be5b39a6b210f4263f0 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
matroska: Clear prev_pkt between seeks.
avutil: change default buffer size alignment for sample buffer functions
audemux: Add a sanity check for the number of channels
Remove libdirac decoder.
matroska: Add incremental parsing of clusters.
avconv: fix off by one check in complex_filter
mpegts: Try seeking back even for nonseekable protocols
swscale: K&R formatting cosmetics (part III)
Conflicts:
configure
doc/general.texi
doc/platform.texi
ffmpeg.c
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/libdirac.h
libavcodec/libdiracdec.c
libavformat/au.c
libavformat/mpegts.c
libswscale/input.c
tests/ref/seek/lavf_mkv
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ref/seek/lavf_mkv | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ref/seek/lavf_mkv b/tests/ref/seek/lavf_mkv index 4e7966bbd7..278d2dc201 100644 --- a/tests/ref/seek/lavf_mkv +++ b/tests/ref/seek/lavf_mkv @@ -30,7 +30,7 @@ ret: 0 st: 0 flags:1 ts: 2.413000 ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292193 size: 27834 ret:-1 st: 1 flags:0 ts: 1.307000 ret: 0 st: 1 flags:1 ts: 0.201000 -ret: 0 st: 1 flags:1 dts: 0.198000 pts: 0.198000 pos: 555 size: 208 +ret: 0 st: 1 flags:1 dts: 0.015000 pts: 0.015000 pos: 555 size: 208 ret: 0 st:-1 flags:0 ts:-0.904994 ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 555 size: 208 ret: 0 st:-1 flags:1 ts: 1.989173 |