mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-10-05 20:43:26 +00:00
3bbf3f7e42
* 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>
49 lines
2.8 KiB
Plaintext
49 lines
2.8 KiB
Plaintext
ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 555 size: 208
|
|
ret: 0 st:-1 flags:0 ts:-1.000000
|
|
ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 555 size: 208
|
|
ret: 0 st:-1 flags:1 ts: 1.894167
|
|
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292193 size: 27834
|
|
ret: 0 st: 0 flags:0 ts: 0.788000
|
|
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292193 size: 27834
|
|
ret: 0 st: 0 flags:1 ts:-0.317000
|
|
ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 555 size: 208
|
|
ret:-1 st: 1 flags:0 ts: 2.577000
|
|
ret: 0 st: 1 flags:1 ts: 1.471000
|
|
ret: 0 st: 1 flags:1 dts: 1.008000 pts: 1.008000 pos: 320250 size: 209
|
|
ret: 0 st:-1 flags:0 ts: 0.365002
|
|
ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146746 size: 27925
|
|
ret: 0 st:-1 flags:1 ts:-0.740831
|
|
ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 555 size: 208
|
|
ret:-1 st: 0 flags:0 ts: 2.153000
|
|
ret: 0 st: 0 flags:1 ts: 1.048000
|
|
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292193 size: 27834
|
|
ret: 0 st: 1 flags:0 ts:-0.058000
|
|
ret: 0 st: 1 flags:1 dts: 0.015000 pts: 0.015000 pos: 555 size: 208
|
|
ret: 0 st: 1 flags:1 ts: 2.836000
|
|
ret: 0 st: 1 flags:1 dts: 1.008000 pts: 1.008000 pos: 320250 size: 209
|
|
ret:-1 st:-1 flags:0 ts: 1.730004
|
|
ret: 0 st:-1 flags:1 ts: 0.624171
|
|
ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146746 size: 27925
|
|
ret: 0 st: 0 flags:0 ts:-0.482000
|
|
ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 555 size: 208
|
|
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.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
|
|
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292193 size: 27834
|
|
ret: 0 st: 0 flags:0 ts: 0.883000
|
|
ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292193 size: 27834
|
|
ret: 0 st: 0 flags:1 ts:-0.222000
|
|
ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 555 size: 208
|
|
ret:-1 st: 1 flags:0 ts: 2.672000
|
|
ret: 0 st: 1 flags:1 ts: 1.566000
|
|
ret: 0 st: 1 flags:1 dts: 1.008000 pts: 1.008000 pos: 320250 size: 209
|
|
ret: 0 st:-1 flags:0 ts: 0.460008
|
|
ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146746 size: 27925
|
|
ret: 0 st:-1 flags:1 ts:-0.645825
|
|
ret: 0 st: 1 flags:1 dts: 0.000000 pts: 0.000000 pos: 555 size: 208
|