mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-18 03:19:31 +02:00
0ebd83617f
* qatar/master: (27 commits)
avconv: free packet in write_frame() when discarding due to frame number limit
FATE: use +/- flag option syntax for vp8 emu-edge tests
lavf: make av_interleave_packet_per_dts() private.
lavf: deprecate av_read_packet().
oggdec: output correct timestamps for Vorbis
avconv: pass input stream timestamps to audio encoders
lavc: shrink encoded audio packet size after encoding.
xa: set correct bit rate
xa: do not set bit_rate, block_align, or bits_per_coded_sample
xa: fix end-of-file handling
xa: fix timestamp calculation
bink: fix typo in FFALIGN() argument
bink: align plane width to 8 when calculating bundle sizes
doc: pass -Idoc texi2html and texi2pod
doc: texi2pod: add -I flag
movenc: Add a min_frag_duration option
rtsp: Set the default delay to 0.1 s for the RTSP/SDP/RTP demuxers
libavformat: Set the default for the max_delay option to -1
Generate manpages for AV{Format,Codec}Context AVOptions.
doc/avconv: remove entries for AVOptions.
...
Conflicts:
doc/Makefile
doc/ffmpeg.texi
doc/muxers.texi
ffmpeg.c
libavcodec/Makefile
libavcodec/options.c
libavcodec/vp8.c
libavformat/options.c
tests/fate/demux.mak
tests/ref/fate/truemotion1-15
tests/ref/fate/truemotion1-24
Merged-by: Michael Niedermayer <michaelni@gmx.at>
47 lines
2.5 KiB
Plaintext
47 lines
2.5 KiB
Plaintext
#tb 0: 1/15
|
|
#tb 1: 1/44100
|
|
0, 0, 0, 1, 69120, 0x68beb30f
|
|
1, 0, 0, 2708, 10832, 0x1597b4c8
|
|
1, 2708, 2708, 2708, 10832, 0xf9479f8b
|
|
0, 1, 1, 1, 69120, 0x3976f5cf
|
|
1, 5416, 5416, 2708, 10832, 0x8db50e74
|
|
0, 2, 2, 1, 69120, 0xf815bc3c
|
|
1, 8124, 8124, 2708, 10832, 0x2b33ecbb
|
|
0, 3, 3, 1, 69120, 0xa7cc0ae6
|
|
1, 10832, 10832, 2708, 10832, 0x8d0f537b
|
|
0, 4, 4, 1, 69120, 0xd85ac282
|
|
1, 13540, 13540, 2708, 10832, 0x922081c7
|
|
0, 5, 5, 1, 69120, 0xf7fd7edb
|
|
1, 16248, 16248, 2708, 10832, 0x40291f19
|
|
0, 6, 6, 1, 69120, 0x433bb6f6
|
|
1, 18956, 18956, 2708, 10832, 0x88f5271a
|
|
0, 7, 7, 1, 69120, 0xdbac8bee
|
|
1, 21665, 21665, 2708, 10832, 0x55c6bbe5
|
|
0, 8, 8, 1, 69120, 0x88e2a799
|
|
1, 24373, 24373, 2708, 10832, 0x9b51ae82
|
|
0, 9, 9, 1, 69120, 0x49617b26
|
|
1, 27081, 27081, 2708, 10832, 0xcdf2409b
|
|
0, 10, 10, 1, 69120, 0xeb44ca01
|
|
1, 29789, 29789, 2708, 10832, 0x0933b1a4
|
|
0, 11, 11, 1, 69120, 0x6fea37e8
|
|
1, 32497, 32497, 2708, 10832, 0x24b77006
|
|
1, 35205, 35205, 2708, 10832, 0xf612fa8a
|
|
0, 12, 12, 1, 69120, 0xf55d74c7
|
|
1, 37913, 37913, 2708, 10832, 0x99884b06
|
|
0, 13, 13, 1, 69120, 0xb5082ca7
|
|
1, 40621, 40621, 2708, 10832, 0x3c746fbe
|
|
0, 14, 14, 1, 69120, 0x5876d758
|
|
1, 43329, 43329, 2708, 10832, 0x05f3b08a
|
|
0, 15, 15, 1, 69120, 0x45e7dd5c
|
|
1, 46037, 46037, 2708, 10832, 0xa6560483
|
|
1, 48745, 48745, 2708, 10832, 0xd98a8e19
|
|
1, 51453, 51453, 2708, 10832, 0xf98a0b2e
|
|
1, 54161, 54161, 2708, 10832, 0xb1039582
|
|
1, 56869, 56869, 2708, 10832, 0x85dd5c3f
|
|
1, 59578, 59578, 2708, 10832, 0x19fc801a
|
|
1, 62286, 62286, 2708, 10832, 0x95805089
|
|
1, 64994, 64994, 2708, 10832, 0x576fdec3
|
|
1, 67702, 67702, 2708, 10832, 0x704a0905
|
|
1, 70410, 70410, 2708, 10832, 0xf87ce1fa
|
|
1, 73118, 73118, 2708, 10832, 0xfc0076b9
|