199683c898
mov: remove unused function
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-02-07 11:54:46 +01:00
b3d2c6f8b9
lavf/segment: fix DTS inconsistencies with -reset_timestamps
...
The DTS needs to be resynched against the segment start PTS, or the
resulting DTS may result < PTS.
Reported-by: Owen Jones <riots6@gmail.com >
See thread:
Subject: [FFmpeg-user] pts/dts error using reset_timestamps while splitting a DVD
Date: Sat, 19 Jan 2013 08:58:27 +0000
2013-02-06 22:55:18 +01:00
59d40fc7e6
lavf/mov: skip version and flags attributes in mov_read_chan function
...
Fixes ticket #1764 .
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-02-06 22:39:40 +01:00
864fdfa062
framecrcenc: print all side data elements, not just the first
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-02-06 18:17:27 +01:00
b2c4431944
framecrcenc: Also print the size of side data elements
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-02-06 18:17:03 +01:00
579c4add63
Fate test to print side_data crc if present
...
Modified the fate test crc generator to print the side_data's
crc if side_data is present.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-02-06 17:53:47 +01:00
fadf845973
Merge commit '48a4ffa722c0874b251de9d201babed52cef0bcb'
...
* commit '48a4ffa722c0874b251de9d201babed52cef0bcb':
asf: K&R formatting cosmetics
vc1dec: use codec_id instead of codec_tag for VC1IMAGE
sh4: drop unused functions
Conflicts:
libavformat/asf.c
libavformat/asfdec.c
libavformat/asfenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-02-06 14:25:28 +01:00
48a4ffa722
asf: K&R formatting cosmetics
2013-02-06 09:48:51 +01:00
a12787960e
lavf/segment: extend PTS debugging log with -reset_timestamps
2013-02-06 00:40:09 +01:00
f0eacbc760
dvenc: dont fail hard if the timecode is invalid
...
Instead just dont store the timecode
Fixes Ticket2187
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-02-05 22:57:35 +01:00
a8343bfb6a
riff: fix infinite loop
...
Fixes Ticket2241
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-02-05 18:31:27 +01:00
90020d7f4b
lavf/segment: use correct spelling and value for EXT-X-ALLOW-CACHE tag
...
Replace wrong "EXT-X-ALLOWCACHE" with "EXT-X-ALLOW-CACHE", and value 1/0
with YES/NO, as per spec.
Fix trac ticket #2228 .
Signed-off-by: Stefano Sabatini <stefasab@gmail.com >
2013-02-03 11:17:35 +01:00
a60530e3ee
Require at least three frames to autodetect loas.
2013-02-02 22:36:25 +01:00
b45a3e167f
Map the interlaced flag of yuv4mpeg streams to AVCodecContext->field_order.
...
Fixes a part of ticket #2190 .
2013-02-02 12:32:04 +01:00
985e93a865
Do not fail for mixed interlaced / non-interlaced YUV4MPEG streams.
2013-02-02 00:01:48 +01:00
6a50e8a190
Do not change codec in flv streams if the user has forced a codec.
...
Fixes ticket #2218 .
2013-02-01 23:27:15 +01:00
911e270688
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
Use proper "" quotes for local header #includes
ppc: fmtconvert: Drop two unused variables.
bink demuxer: set framerate.
Conflicts:
libavcodec/kbdwin.c
libavcodec/ppc/fmtconvert_altivec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-02-01 14:34:18 +01:00
6c1a7d07eb
Use proper "" quotes for local header #includes
2013-02-01 12:51:15 +01:00
9ec8971060
bink demuxer: set framerate.
2013-02-01 12:42:17 +01:00
1730ca2eca
bink demuxer: check malloc return value
2013-02-01 12:41:38 +01:00
4789c25d83
matroska: fixed missing S_DVBSUB subtitles
2013-02-01 01:49:04 +01:00
01d012ba3d
Merge commit '29f1fa74225e9fdbab6d590857edbecb51cf74da'
...
* commit '29f1fa74225e9fdbab6d590857edbecb51cf74da':
configure: Move newlib libc check before mingw libc check
avisynth: Change demuxer name to avoid conflicts with AVS
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-01-31 19:52:58 +01:00
0f5b0b4178
avisynth: Change demuxer name to avoid conflicts with AVS
2013-01-31 11:19:22 +01:00
fe6767f849
asfdec: fix integer overflow in packet_replic_size check
...
Fixes assertion failure
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-01-31 03:37:43 +01:00
0dcfccaa69
auenc: strict check for supported codec
...
Also check number of streams and give error message why muxing failed.
This prevents muxing unsupported codec with known and supported tag.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-01-30 22:17:52 +00:00
10e4905dd9
auenc: remove put_au_header() and merge its code into au_write_header
...
Such level of abstraction is pointless.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-01-30 22:17:52 +00:00
033f1644b5
fixup_vorbis_headers: add missing malloc failure check
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-01-30 20:04:14 +01:00
0451ff295a
oggparsevorbis: use av_realloc consistently
...
Memory passed to av_realloc cannot be allocated using memalign.
From realloc(3):
The realloc() function changes the size of the memory block pointed to
by ptr to size bytes. (...) Unless ptr is NULL, it must have been returned
by an earlier call to malloc(), calloc() or realloc().
The issue has been found by debugallocation, a part of google-perftools:
http://code.google.com/p/gperftools/ .
Signed-off-by: Paweł Hajdan, Jr <phajdan@google.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-01-30 19:54:35 +01:00
afb4bc3d29
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
movenc: Simplify code by using avio_wb24
bfin: unbreak compilation
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-01-30 14:49:49 +01:00
61d36761ef
movenc: Simplify code by using avio_wb24
...
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-01-30 13:45:45 +02:00
91f359292a
Correctly mark non-default streams when muxing matroska.
...
Fixes ticket #1815 .
Reviewed-by: Hendrik Leppkes
2013-01-30 10:28:53 +01:00
99b1b2b1c6
r3d: check that sampling rate is non negative.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-01-29 17:13:45 +01:00
df92ac1852
r3d: fix division by 0 with 0 sample rate
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-01-29 16:57:50 +01:00
036b9ee1c9
oggenc: fix "oggstream may be used uninitialized in this function" warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-01-29 15:57:42 +01:00
3c8085dc42
Merge commit 'e6b1c3bbe7082c71ea8ee8ac83698c156c9e4838'
...
* commit 'e6b1c3bbe7082c71ea8ee8ac83698c156c9e4838':
pthread: make ff_thread_release_buffer idempotent.
mvi: set framerate
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-01-29 14:19:56 +01:00
729b37149c
mvi: set framerate
...
This container does not store timestamps and thus supports CFR only.
2013-01-29 07:31:55 +01:00
d88d0b6db6
Write forced track flag to matroska files.
...
Based on a patch by Daniel Pielmeier, daniel pielmeier gmail
Fixes a part of ticket #1815 .
2013-01-27 23:24:52 +01:00
f2b6aabd3d
lavf/srtdec: do not try to queue empty subtitle chunks.
...
Regression since 3af3a30
2013-01-27 20:26:35 +09:00
5de286ef88
mvdec: check var_read_string() return value
...
Prevent null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-01-27 02:15:02 +01:00
362271d72f
mvdec: Check the frame counter against the correct limit.
...
fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-01-27 02:11:19 +01:00
d1d159d31e
lavf/gifdec: cosmetics: remove extra whitespace
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-01-26 09:28:57 +00:00
254e11cc01
lavf/gifdec: fix typo
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-01-26 09:28:57 +00:00
13aca070ab
gifdec: resync support
...
This allows decoding gifs that have junk at the begin
and also allows byte wise seeking
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-01-25 17:25:16 +01:00
1ec3324f00
lavf/img2enc: extend current options documentation
2013-01-25 00:04:23 +01:00
069d156454
lavf/img2dec: fix option help fields
2013-01-25 00:04:22 +01:00
55d66b2790
movenc: check that fps for tmcd is within encodable range.
...
The fps is stored as a 8 bit value thus 255 is the maximum encodable.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-01-24 18:59:49 +01:00
9362f31b55
movenc: Calculate fps for tmcd without intermediate step.
...
Fixes part of Ticket2045
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-01-24 18:57:12 +01:00
c071b00643
mpeg12demux: Fallback to startcode for stream type identification.
...
Fixes Ticket2147
Fixes SageTV support
Based-on patch by Andrew Gallatin
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-01-24 17:10:23 +01:00
eb567a7999
eacdata: do not set sample_fmt
...
It is supposed to be set from lavc only.
Also this one differs from one set in decoder.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-01-24 15:02:44 +00:00
7b007a7c1f
flic: do not set sample_fmt
...
It is supposed to be set from lavc only.
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-01-24 15:02:44 +00:00
