mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-29 09:40:48 +00:00
967facb695
* qatar/master: (26 commits) adxenc: use AVCodec.encode2() adxenc: Use the AVFrame in ADXContext for coded_frame indeo4: fix out-of-bounds function call. configure: Restructure help output. configure: Internal-only components should not be command-line selectable. vorbisenc: use AVCodec.encode2() libvorbis: use AVCodec.encode2() libopencore-amrnbenc: use AVCodec.encode2() ra144enc: use AVCodec.encode2() nellymoserenc: use AVCodec.encode2() roqaudioenc: use AVCodec.encode2() libspeex: use AVCodec.encode2() libvo_amrwbenc: use AVCodec.encode2() libvo_aacenc: use AVCodec.encode2() wmaenc: use AVCodec.encode2() mpegaudioenc: use AVCodec.encode2() libmp3lame: use AVCodec.encode2() libgsmenc: use AVCodec.encode2() libfaac: use AVCodec.encode2() g726enc: use AVCodec.encode2() ... Conflicts: configure libavcodec/Makefile libavcodec/ac3enc.c libavcodec/adxenc.c libavcodec/libgsm.c libavcodec/libvorbis.c libavcodec/vorbisenc.c libavcodec/wmaenc.c tests/ref/acodec/g722 tests/ref/lavf/asf tests/ref/lavf/ffm tests/ref/lavf/mkv tests/ref/lavf/mpg tests/ref/lavf/rm tests/ref/lavf/ts tests/ref/seek/lavf_asf tests/ref/seek/lavf_ffm tests/ref/seek/lavf_mkv tests/ref/seek/lavf_mpg tests/ref/seek/lavf_rm tests/ref/seek/lavf_ts Merged-by: Michael Niedermayer <michaelni@gmx.at>
54 lines
3.2 KiB
Plaintext
54 lines
3.2 KiB
Plaintext
ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801
|
|
ret: 0 st:-1 flags:0 ts:-1.000000
|
|
ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801
|
|
ret: 0 st:-1 flags:1 ts: 1.894167
|
|
ret: 0 st: 0 flags:0 dts: 1.880000 pts: 1.920000 pos: 216012 size: 17441
|
|
ret: 0 st: 0 flags:0 ts: 0.788333
|
|
ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801
|
|
ret: 0 st: 0 flags:1 ts:-0.317500
|
|
ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801
|
|
ret: 0 st: 1 flags:0 ts: 2.576667
|
|
ret: 0 st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 404012 size: 209
|
|
ret: 0 st: 1 flags:1 ts: 1.470833
|
|
ret: 0 st: 1 flags:1 dts: 1.389089 pts: 1.389089 pos: 159800 size: 208
|
|
ret: 0 st:-1 flags:0 ts: 0.365002
|
|
ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801
|
|
ret: 0 st:-1 flags:1 ts:-0.740831
|
|
ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801
|
|
ret: 0 st: 0 flags:0 ts: 2.153333
|
|
ret: 0 st: 0 flags:0 dts: 2.160000 pts: 2.200000 pos: 325616 size: 12679
|
|
ret: 0 st: 0 flags:1 ts: 1.047500
|
|
ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801
|
|
ret: 0 st: 1 flags:0 ts:-0.058333
|
|
ret: 0 st: 1 flags:1 dts: 1.389089 pts: 1.389089 pos: 159800 size: 208
|
|
ret: 0 st: 1 flags:1 ts: 2.835833
|
|
ret: 0 st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 404012 size: 209
|
|
ret: 0 st:-1 flags:0 ts: 1.730004
|
|
ret: 0 st: 0 flags:0 dts: 1.760000 pts: 1.800000 pos: 162808 size: 12075
|
|
ret: 0 st:-1 flags:1 ts: 0.624171
|
|
ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801
|
|
ret: 0 st: 0 flags:0 ts:-0.481667
|
|
ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801
|
|
ret: 0 st: 0 flags:1 ts: 2.412500
|
|
ret: 0 st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 404012 size: 209
|
|
ret: 0 st: 1 flags:0 ts: 1.306667
|
|
ret: 0 st: 1 flags:1 dts: 1.389089 pts: 1.389089 pos: 159800 size: 208
|
|
ret: 0 st: 1 flags:1 ts: 0.200844
|
|
ret: 0 st: 1 flags:1 dts: 1.389089 pts: 1.389089 pos: 159800 size: 208
|
|
ret: 0 st:-1 flags:0 ts:-0.904994
|
|
ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801
|
|
ret: 0 st:-1 flags:1 ts: 1.989173
|
|
ret: 0 st: 0 flags:0 dts: 1.960000 pts: 2.000000 pos: 250980 size: 13438
|
|
ret: 0 st: 0 flags:0 ts: 0.883344
|
|
ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801
|
|
ret: 0 st: 0 flags:1 ts:-0.222489
|
|
ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801
|
|
ret: 0 st: 1 flags:0 ts: 2.671678
|
|
ret: 0 st: 1 flags:1 dts: 2.120522 pts: 2.120522 pos: 404012 size: 209
|
|
ret: 0 st: 1 flags:1 ts: 1.565844
|
|
ret: 0 st: 1 flags:1 dts: 1.389089 pts: 1.389089 pos: 159800 size: 208
|
|
ret: 0 st:-1 flags:0 ts: 0.460008
|
|
ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801
|
|
ret: 0 st:-1 flags:1 ts:-0.645825
|
|
ret: 0 st: 0 flags:1 dts: 1.360000 pts: 1.400000 pos: 564 size: 24801
|