mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02: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>
42 lines
2.3 KiB
Plaintext
42 lines
2.3 KiB
Plaintext
ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 27072 size: 208
|
|
ret: 0 st:-1 flags:0 ts:-1.000000
|
|
ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 27072 size: 208
|
|
ret:-1 st:-1 flags:1 ts: 1.894167
|
|
ret: 0 st: 0 flags:0 ts: 0.788334
|
|
ret: 0 st: 1 flags:1 dts: 0.772766 pts: 0.772766 pos: 321176 size: 209
|
|
ret: 0 st: 0 flags:1 ts:-0.317499
|
|
ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 27072 size: 208
|
|
ret:-1 st: 1 flags:0 ts: 2.576668
|
|
ret:-1 st: 1 flags:1 ts: 1.470835
|
|
ret: 0 st:-1 flags:0 ts: 0.365002
|
|
ret: 0 st: 1 flags:1 dts: 0.380930 pts: 0.380930 pos: 167496 size: 209
|
|
ret: 0 st:-1 flags:1 ts:-0.740831
|
|
ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 27072 size: 208
|
|
ret:-1 st: 0 flags:0 ts: 2.153336
|
|
ret:-1 st: 0 flags:1 ts: 1.047503
|
|
ret: 0 st: 1 flags:0 ts:-0.058330
|
|
ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 27072 size: 208
|
|
ret:-1 st: 1 flags:1 ts: 2.835837
|
|
ret:-1 st:-1 flags:0 ts: 1.730004
|
|
ret: 0 st:-1 flags:1 ts: 0.624171
|
|
ret: 0 st: 1 flags:1 dts: 0.616032 pts: 0.616032 pos: 266576 size: 209
|
|
ret: 0 st: 0 flags:0 ts:-0.481662
|
|
ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 27072 size: 208
|
|
ret:-1 st: 0 flags:1 ts: 2.412505
|
|
ret:-1 st: 1 flags:0 ts: 1.306672
|
|
ret: 0 st: 1 flags:1 ts: 0.200839
|
|
ret: 0 st: 1 flags:1 dts: 0.224195 pts: 0.224195 pos: 113640 size: 209
|
|
ret: 0 st:-1 flags:0 ts:-0.904994
|
|
ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 27072 size: 208
|
|
ret:-1 st:-1 flags:1 ts: 1.989173
|
|
ret: 0 st: 0 flags:0 ts: 0.883340
|
|
ret: 0 st: 1 flags:1 dts: 0.903379 pts: 0.903379 pos: 357944 size: 209
|
|
ret: 0 st: 0 flags:1 ts:-0.222493
|
|
ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 27072 size: 208
|
|
ret:-1 st: 1 flags:0 ts: 2.671674
|
|
ret:-1 st: 1 flags:1 ts: 1.565841
|
|
ret: 0 st:-1 flags:0 ts: 0.460008
|
|
ret: 0 st: 1 flags:1 dts: 0.459297 pts: 0.459297 pos: 205776 size: 209
|
|
ret: 0 st:-1 flags:1 ts:-0.645825
|
|
ret: 0 st: 1 flags:1 dts:-0.010907 pts:-0.010907 pos: 27072 size: 208
|