diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-04 02:03:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-04 04:26:04 +0100 |
| commit | 15c6be8c7da7b94b5e131396e9a82ab6fe4a6b64 (patch) | |
| tree | 84db7f4851faba26561f846b4f112ef64d01b3ad /tests/ref | |
| parent | f972193a15026a99eb2b08e7913a03f2123663da (diff) | |
| parent | b7beabab4b78cc253d06c0a33f15b8ff79866e85 (diff) | |
| download | ffmpeg-15c6be8c7da7b94b5e131396e9a82ab6fe4a6b64.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
tiertexseq: set correct block_align for audio
tiertexseq: set audio stream start time to 0
voc/avs: Do not change the sample rate mid-stream.
segafilm: use the sample rate as the time base for audio streams
ea: fix audio pts
psx-str: fix audio pts
vqf: set packet duration
tta demuxer: set packet duration
mpegaudio_parser: do not ignore information from the first parsed frame
mpegaudio_parser: be less picky about the start position
thp: set audio packet durations
avcodec: add a Vorbis parser to get packet duration
vorbisdec: read the previous window flag for long windows
lavc: free the output packet when encoding failed or produced no output.
lavc: preserve avpkt->destruct in ff_alloc_packet().
lavc: clarify the meaning of AVCodecContext.frame_number.
mpegts: Pad the packet buffer in handle_packet().
mpegts: Do not call read_sl_header() when no bytes remain in the buffer.
Conflicts:
libavcodec/mpegaudio_parser.c
libavcodec/version.h
libavformat/mpegts.c
tests/ref/fate/pva-demux
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref')
| -rw-r--r-- | tests/ref/fate/tiertex-seq | 42 | ||||
| -rw-r--r-- | tests/ref/fate/vqf-demux | 2 | ||||
| -rw-r--r-- | tests/ref/seek/lavf_voc | 24 |
3 files changed, 34 insertions, 34 deletions
diff --git a/tests/ref/fate/tiertex-seq b/tests/ref/fate/tiertex-seq index 595309342e..74407e7674 100644 --- a/tests/ref/fate/tiertex-seq +++ b/tests/ref/fate/tiertex-seq @@ -1,100 +1,100 @@ #tb 0: 1/25 #tb 1: 1/22050 -0, 0, 0, 1, 98304, 0x2e5db4a4 1, 0, 0, 882, 1764, 0x00000000 1, 882, 882, 882, 1764, 0x80a253d9 +0, 2, 2, 1, 98304, 0x2e5db4a4 1, 1764, 1764, 882, 1764, 0x95a16721 1, 2646, 2646, 882, 1764, 0x0f0d4cb6 -0, 4, 4, 1, 98304, 0xb20c19d0 1, 3528, 3528, 882, 1764, 0x75026779 1, 4410, 4410, 882, 1764, 0xb4356e37 +0, 6, 6, 1, 98304, 0xb20c19d0 1, 5292, 5292, 882, 1764, 0xfafa64cb -0, 7, 7, 1, 98304, 0x6b8538c0 1, 6174, 6174, 882, 1764, 0xe8fd7970 1, 7056, 7056, 882, 1764, 0x666879b7 +0, 9, 9, 1, 98304, 0x6b8538c0 1, 7938, 7938, 882, 1764, 0xf2cd7770 1, 8820, 8820, 882, 1764, 0x54317a1c -0, 11, 11, 1, 98304, 0x172207e3 1, 9702, 9702, 882, 1764, 0x9c396930 1, 10584, 10584, 882, 1764, 0x87115ec4 +0, 13, 13, 1, 98304, 0x172207e3 1, 11466, 11466, 882, 1764, 0x0c9b69b6 -0, 14, 14, 1, 98304, 0x63fb7dc1 1, 12348, 12348, 882, 1764, 0x8c3a758a 1, 13230, 13230, 882, 1764, 0x605d776a +0, 16, 16, 1, 98304, 0x63fb7dc1 1, 14112, 14112, 882, 1764, 0x0556852d 1, 14994, 14994, 882, 1764, 0x7d4363f8 -0, 18, 18, 1, 98304, 0x37cf1601 1, 15876, 15876, 882, 1764, 0xc5cd75d0 1, 16758, 16758, 882, 1764, 0x3ff3646d +0, 20, 20, 1, 98304, 0x37cf1601 1, 17640, 17640, 882, 1764, 0x10136d25 1, 18522, 18522, 882, 1764, 0xeb1a6cd0 -0, 22, 22, 1, 98304, 0x82941990 1, 19404, 19404, 882, 1764, 0xef937ed1 1, 20286, 20286, 882, 1764, 0x2d2b6f79 +0, 24, 24, 1, 98304, 0x82941990 1, 21168, 21168, 882, 1764, 0x6f457231 -0, 25, 25, 1, 98304, 0xe0a5309e 1, 22050, 22050, 882, 1764, 0x56267c9d 1, 22932, 22932, 882, 1764, 0xd49e79c8 +0, 27, 27, 1, 98304, 0xe0a5309e 1, 23814, 23814, 882, 1764, 0xc726703d 1, 24696, 24696, 882, 1764, 0x2abf8074 -0, 29, 29, 1, 98304, 0x164cb67d 1, 25578, 25578, 882, 1764, 0xb50c556d 1, 26460, 26460, 882, 1764, 0xc1f2523c +0, 31, 31, 1, 98304, 0x164cb67d 1, 27342, 27342, 882, 1764, 0x850a6f93 -0, 32, 32, 1, 98304, 0xed2189f8 1, 28224, 28224, 882, 1764, 0x8da76c31 1, 29106, 29106, 882, 1764, 0xfcccdf13 +0, 34, 34, 1, 98304, 0xed2189f8 1, 29988, 29988, 882, 1764, 0x00000000 1, 30870, 30870, 882, 1764, 0x00000000 -0, 36, 36, 1, 98304, 0x7215e529 1, 31752, 31752, 882, 1764, 0x00000000 1, 32634, 32634, 882, 1764, 0x00000000 +0, 38, 38, 1, 98304, 0x7215e529 1, 33516, 33516, 882, 1764, 0x00000000 -0, 39, 39, 1, 98304, 0x170c783b 1, 34398, 34398, 882, 1764, 0x00000000 1, 35280, 35280, 882, 1764, 0x00000000 +0, 41, 41, 1, 98304, 0x170c783b 1, 36162, 36162, 882, 1764, 0x00000000 1, 37044, 37044, 882, 1764, 0x00000000 -0, 43, 43, 1, 98304, 0xf6bd74c7 1, 37926, 37926, 882, 1764, 0x00000000 1, 38808, 38808, 882, 1764, 0x00000000 +0, 45, 45, 1, 98304, 0xf6bd74c7 1, 39690, 39690, 882, 1764, 0x00000000 1, 40572, 40572, 882, 1764, 0x00000000 -0, 47, 47, 1, 98304, 0x1efd38c4 1, 41454, 41454, 882, 1764, 0x00000000 1, 42336, 42336, 882, 1764, 0x00000000 +0, 49, 49, 1, 98304, 0x1efd38c4 1, 43218, 43218, 882, 1764, 0x00000000 -0, 50, 50, 1, 98304, 0x29c26bba 1, 44100, 44100, 882, 1764, 0x00000000 1, 44982, 44982, 882, 1764, 0x00000000 +0, 52, 52, 1, 98304, 0x29c26bba 1, 45864, 45864, 882, 1764, 0x00000000 1, 46746, 46746, 882, 1764, 0x00000000 -0, 54, 54, 1, 98304, 0x880a6313 1, 47628, 47628, 882, 1764, 0x00000000 1, 48510, 48510, 882, 1764, 0x00000000 +0, 56, 56, 1, 98304, 0x880a6313 1, 49392, 49392, 882, 1764, 0x00000000 -0, 57, 57, 1, 98304, 0x73f5bb00 1, 50274, 50274, 882, 1764, 0x00000000 1, 51156, 51156, 882, 1764, 0x00000000 +0, 59, 59, 1, 98304, 0x73f5bb00 1, 52038, 52038, 882, 1764, 0x00000000 1, 52920, 52920, 882, 1764, 0x00000000 -0, 61, 61, 1, 98304, 0xc85b19ec 1, 53802, 53802, 882, 1764, 0x00000000 1, 54684, 54684, 882, 1764, 0x00000000 +0, 63, 63, 1, 98304, 0xc85b19ec 1, 55566, 55566, 882, 1764, 0x00000000 -0, 64, 64, 1, 98304, 0x00000000 1, 56448, 56448, 882, 1764, 0x00000000 1, 57330, 57330, 882, 1764, 0x00000000 +0, 66, 66, 1, 98304, 0x00000000 1, 58212, 58212, 882, 1764, 0x00000000 1, 59094, 59094, 882, 1764, 0x00000000 -0, 68, 68, 1, 98304, 0x00000000 1, 59976, 59976, 882, 1764, 0x00000000 1, 60858, 60858, 882, 1764, 0x00000000 +0, 70, 70, 1, 98304, 0x00000000 1, 61740, 61740, 882, 1764, 0x00000000 1, 62622, 62622, 882, 1764, 0x00000000 -0, 72, 72, 1, 98304, 0x00000000 1, 63504, 63504, 882, 1764, 0x00000000 1, 64386, 64386, 882, 1764, 0x00000000 +0, 74, 74, 1, 98304, 0x00000000 1, 65268, 65268, 882, 1764, 0x00000000 1, 66150, 66150, 882, 1764, 0x00000000 1, 67032, 67032, 882, 1764, 0x00000000 diff --git a/tests/ref/fate/vqf-demux b/tests/ref/fate/vqf-demux index 3d4cd3dd78..3acae60f5a 100644 --- a/tests/ref/fate/vqf-demux +++ b/tests/ref/fate/vqf-demux @@ -1 +1 @@ -178a10705baabc5b82bd79240f38a700 +d72fb75fb22f4bcc94a1dc7af5356ec1 diff --git a/tests/ref/seek/lavf_voc b/tests/ref/seek/lavf_voc index 5670d1a992..387aef6cb8 100644 --- a/tests/ref/seek/lavf_voc +++ b/tests/ref/seek/lavf_voc @@ -1,27 +1,27 @@ ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 32 size: 1024 ret:-1 st:-1 flags:0 ts:-1.000000 ret:-1 st:-1 flags:1 ts: 1.894167 -ret:-1 st: 0 flags:0 ts: 0.788333 -ret:-1 st: 0 flags:1 ts:-0.317500 +ret:-1 st: 0 flags:0 ts: 0.788335 +ret:-1 st: 0 flags:1 ts:-0.317508 ret:-1 st:-1 flags:0 ts: 2.576668 ret:-1 st:-1 flags:1 ts: 1.470835 -ret:-1 st: 0 flags:0 ts: 0.365000 -ret:-1 st: 0 flags:1 ts:-0.740833 +ret:-1 st: 0 flags:0 ts: 0.365006 +ret:-1 st: 0 flags:1 ts:-0.740837 ret:-1 st:-1 flags:0 ts: 2.153336 ret:-1 st:-1 flags:1 ts: 1.047503 -ret:-1 st: 0 flags:0 ts:-0.058333 -ret:-1 st: 0 flags:1 ts: 2.835833 +ret:-1 st: 0 flags:0 ts:-0.058323 +ret:-1 st: 0 flags:1 ts: 2.835834 ret:-1 st:-1 flags:0 ts: 1.730004 ret:-1 st:-1 flags:1 ts: 0.624171 -ret:-1 st: 0 flags:0 ts:-0.481667 -ret:-1 st: 0 flags:1 ts: 2.412500 +ret:-1 st: 0 flags:0 ts:-0.481652 +ret:-1 st: 0 flags:1 ts: 2.412505 ret:-1 st:-1 flags:0 ts: 1.306672 ret:-1 st:-1 flags:1 ts: 0.200839 -ret:-1 st: 0 flags:0 ts:-0.904989 -ret:-1 st: 0 flags:1 ts: 1.989178 +ret:-1 st: 0 flags:0 ts:-0.905003 +ret:-1 st: 0 flags:1 ts: 1.989176 ret:-1 st:-1 flags:0 ts: 0.883340 ret:-1 st:-1 flags:1 ts:-0.222493 -ret:-1 st: 0 flags:0 ts: 2.671678 -ret:-1 st: 0 flags:1 ts: 1.565844 +ret:-1 st: 0 flags:0 ts: 2.671668 +ret:-1 st: 0 flags:1 ts: 1.565847 ret:-1 st:-1 flags:0 ts: 0.460008 ret:-1 st:-1 flags:1 ts:-0.645825 |