72eddc10fa
Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'
...
* commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9':
lavf: Reset the entry count and allocation size variables on av_reallocp failures
Conflicts:
libavformat/avienc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-27 12:13:41 +02:00
d872fb0f7f
lavf: Reset the entry count and allocation size variables on av_reallocp failures
...
When av_reallocp fails, the associated variables that keep track of
the number of elements in the array (and in some cases, the
separate number of allocated elements) need to be reset.
Not all of these might technically be needed, but it's better to
reset them if in doubt, to make sure variables don't end up
conflicting.
Signed-off-by: Martin Storsjö <martin@martin.st >
2013-09-26 23:14:03 +03:00
20dfab33f5
Merge commit '5626f994f273af80fb100d4743b963304de9e05c'
...
* commit '5626f994f273af80fb100d4743b963304de9e05c':
avformat: Use av_reallocp() where suitable
Conflicts:
libavformat/avidec.c
libavformat/avienc.c
libavformat/aviobuf.c
libavformat/oggparsevorbis.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-19 11:01:26 +02:00
5626f994f2
avformat: Use av_reallocp() where suitable
...
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2013-09-18 18:28:38 +02:00
c051d668b5
avformat/avidec: use av_calloc() and check for allocation error
...
Signed-off-by: Paul B Mahol <onemda@gmail.com >
2013-09-16 18:53:28 +00:00
8586d8dda2
avformat/avidec: fix signedness of pointer type in get_stream_idx()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-09-08 19:02:19 +02:00
227a0eb5a9
avformat/avidec: match first index and first packet size=0 handling
...
Fixes Ticket2861
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-08-31 03:08:25 +02:00
20be5e0a0e
Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'
...
* commit '7950e519bb094897f957b9a9531cc60ba46cbc91':
Disable deprecation warnings for cases where a replacement is available
Conflicts:
libavcodec/avpacket.c
libavcodec/pthread.c
libavcodec/utils.c
libavdevice/v4l2.c
libavfilter/avfiltergraph.c
libavfilter/buffersrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-08-03 10:08:30 +02:00
7950e519bb
Disable deprecation warnings for cases where a replacement is available
2013-08-02 19:19:02 +02:00
3afcddcff2
Merge commit 'c8f0b20b4a6bb6691928789d83e4b02896969848'
...
* commit 'c8f0b20b4a6bb6691928789d83e4b02896969848':
avidec: Let the inner dv demuxer take care of discarding
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-07-28 13:15:21 +02:00
d781220991
Merge commit '10aa44aa675e05067845e3e55fac37642cbbdae4'
...
* commit '10aa44aa675e05067845e3e55fac37642cbbdae4':
avidec: K&R formatting cosmetics
Conflicts:
libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-07-28 13:06:38 +02:00
c8f0b20b4a
avidec: Let the inner dv demuxer take care of discarding
...
CC: libav-stable@libav.org
2013-07-27 16:00:11 +02:00
10aa44aa67
avidec: K&R formatting cosmetics
...
Signed-off-by: Diego Biurrun <diego@biurrun.de >
Signed-off-by: Luca Barbato <lu_zero@gentoo.org >
2013-07-27 16:00:11 +02:00
ef8cc06d6e
avformat/avidec: Fix incorrect detection of badly interleaved avi
...
The method guess_ni_flag needs to divide timestamps in the index
by sample_size if it is set in order to compare different streams correctly.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-07-05 22:07:48 +02:00
6c593f1b67
avidec: dont randomly skip packets for offseting the index
...
Fixes Ticket2490
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-17 22:16:10 +02:00
231b331718
Do not read strd chunk in avi files as H264 extradata.
...
Fixes ticket #2561 .
2013-05-13 12:39:44 +02:00
a079ed63d3
avidec: Enable full parsing for potencoder mpeg1/2
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-10 16:55:06 +02:00
f083b4c338
Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'
...
* commit 'e0f8be6413b6a8d334d6052e610af32935c310af':
avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate
Conflicts:
libavformat/ac3dec.c
libavformat/avformat.h
libavformat/avs.c
libavformat/m4vdec.c
libavformat/mov.c
libavformat/mp3dec.c
libavformat/mpeg.c
libavformat/mpegvideodec.c
libavformat/psxstr.c
libavformat/pva.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-05-05 12:31:03 +02:00
e0f8be6413
avformat: Add AVPROBE_SCORE_EXTENSION define and use where appropriate
2013-05-04 21:43:06 +02:00
27b7bfc7b5
avidec: Fix demuxing of non seekable avis with multiple RIFFs
...
This solution uses the size of the first RIFF if its valid
to check frame size validity when the filesize could not be determined.
Feedback is welcome, other ideas and improvments as well!
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-28 17:30:42 +01:00
8d0da20ca6
avidec: fix duration and bitrate of truncated files
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-19 13:09:52 +01:00
2653e12520
Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'
...
* commit '1afddbe59e96af75f1c07605afc95615569f388f':
avpacket: use AVBuffer to allow refcounting the packets.
Conflicts:
libavcodec/avpacket.c
libavcodec/utils.c
libavdevice/v4l2.c
libavformat/avidec.c
libavformat/flacdec.c
libavformat/id3v2.c
libavformat/matroskaenc.c
libavformat/mux.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-03-08 19:12:03 +01:00
1afddbe59e
avpacket: use AVBuffer to allow refcounting the packets.
...
This will allow us to avoid copying the packets in many cases.
This breaks ABI.
2013-03-08 07:33:45 +01:00
82d79289db
avformat: Allocate duration_error separately
...
This significantly reduces the memory needed per AVStream when the
array is not needed.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2013-02-23 23:15:09 +01:00
b4a7f4d018
Merge commit '570a4a0189946c2c983da41d37fdd67fa13266e7'
...
* commit '570a4a0189946c2c983da41d37fdd67fa13266e7':
avidec: use sensible error codes instead of -1
Conflicts:
libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2013-01-22 13:38:20 +01:00
570a4a0189
avidec: use sensible error codes instead of -1
...
Use AVERROR_INVALIDDATA on invalid inputs, and AVERROR_EOF when no more
frames are available in an interleaved AVI.
Signed-off-by: Jindrich Makovicka <makovick@gmail.com >
Signed-off-by: Diego Biurrun <diego@biurrun.de >
2013-01-21 16:02:40 +01:00
028cc42a16
read_gab2_sub: fix null pointer dereference
...
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-12-12 17:46:05 +01:00
ccf771cd79
Correctly skip strf tag for subtitles when decoding avi.
...
Fixes ticket #1797 .
2012-11-30 10:18:37 +01:00
be89693ddc
avidec: try to support oddly muxed MMES stream
...
Fixes ticket1804
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-11-22 23:20:35 +01:00
3d48dd01fd
avidec: remove unneeded null check
...
Fixes CID29555
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-10-19 21:46:39 +02:00
2fed05f53a
avoid more "0xFF << 24" as it is considered a integer overflow in C99
...
missed these in my previous search and replace
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-10-14 03:34:16 +02:00
e3301459f6
avidec: Use sample size in case incorrect timestamps for aac in AVI (Ticket #1755 )
...
In some case for aac in AVI, avidec extracts wrong PTS value.
(www.ffmpeg.org/trac/ffmpeg/ticket/1755)
I found additional case(ss=4096) and add condition.
Problematic file link : https://docs.google.com/open?id=0B6r7ZfWFIypCOTdZQUtGVEdJUUE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-10-12 17:57:35 +02:00
1a104bf641
Fix broken timestamps for some mp3 in avi samples.
...
Mostly based on 73ad355#606 .
2012-10-10 23:59:43 +02:00
73ad355d23
avidec: fix 10l typo
...
found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-10-10 17:06:12 +02:00
229e33a2b6
avidec: override sample size of 1024 for VBR AAC
...
Fixes Ticket1755
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-10-10 16:48:58 +02:00
31ab1575e5
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
avcodec: Convert some commented-out printf/av_log instances to av_dlog
avcodec: Drop silly and/or broken printf debug output
avcodec: Drop some silly commented-out av_log() invocations
avformat: Convert some commented-out printf/av_log instances to av_dlog
avformat: Remove non-compiling and/or silly commented-out printf/av_log statements
Remove some silly disabled code.
ac3dec: ensure get_buffer() gets a buffer for the correct number of channels
Conflicts:
libavcodec/dnxhddec.c
libavcodec/ffv1.c
libavcodec/h264.c
libavcodec/h264_parser.c
libavcodec/mjpegdec.c
libavcodec/motion_est_template.c
libavcodec/mpegaudiodec.c
libavcodec/mpegvideo_enc.c
libavcodec/put_bits.h
libavcodec/ratecontrol.c
libavcodec/wmaenc.c
libavdevice/timefilter.c
libavformat/asfdec.c
libavformat/avidec.c
libavformat/avienc.c
libavformat/flvenc.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-10-01 16:12:38 +02:00
72eaba5e4f
avformat: Convert some commented-out printf/av_log instances to av_dlog
2012-10-01 10:24:28 +02:00
11d4e92ed9
avformat: Remove non-compiling and/or silly commented-out printf/av_log statements
2012-10-01 10:24:28 +02:00
b96dc093ea
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
wmalosslessdec: increase channel_coeffs/residues size
wmalosslessdec: increase WMALL_BLOCK_MAX_BITS to 14.
lagarith: check count before writing zeros.
wmaprodec: check num_vec_coeffs for validity
avidec: use actually read size instead of requested size
avidec: return 0, not packet size from read_packet().
Conflicts:
libavcodec/lagarith.c
libavcodec/wmalosslessdec.c
libavcodec/wmaprodec.c
libavformat/avidec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-29 15:11:34 +02:00
0af49a63c7
avidec: use actually read size instead of requested size
...
Fixes CVE-2012-2788
2012-09-29 09:27:59 +02:00
eeade678f0
avidec: return 0, not packet size from read_packet().
2012-09-29 09:27:51 +02:00
8d07742cb1
avidec: workaround aac with broken block align
...
Fixes Ticket1742
Based on patch by: Nikola Vranic <nikola.vranic@rt-rk.com >
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-18 22:39:54 +02:00
108957c661
avidec/guess_ni_flag: fix harmless integer overflow
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-10 16:56:59 +02:00
d46c1c72e4
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
...
* commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9':
avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member
Conflicts:
libavcodec/libopenjpegdec.c
libavcodec/libopenjpegenc.c
libavcodec/libx264.c
libavcodec/mpeg12enc.c
libavcodec/options_table.h
libavcodec/snowenc.c
libavcodec/tiffenc.c
libavdevice/v4l2.c
libavdevice/x11grab.c
libavfilter/af_amix.c
libavfilter/af_asyncts.c
libavfilter/af_join.c
libavfilter/buffersrc.c
libavfilter/src_movie.c
libavfilter/vf_delogo.c
libavfilter/vf_drawtext.c
libavformat/http.c
libavformat/img2dec.c
libavformat/img2enc.c
libavformat/movenc.c
libavformat/mpegenc.c
libavformat/mpegtsenc.c
libavformat/options_table.h
libavformat/segment.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-05 14:33:32 +02:00
08277a45c3
lavf: add missing new line to some error messages
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-09-01 15:59:30 +02:00
ba2cf854d0
lavc: move AVRn to a seperate decoder.
...
The special cases in demuxers and decoders are a mess otherwise (and more
would be needed to support it fully)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-08-20 02:46:09 +02:00
7a72695c05
Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'
...
* commit '36ef5369ee9b336febc2c270f8718cec4476cb85':
Replace all CODEC_ID_* with AV_CODEC_ID_*
lavc: add AV prefix to codec ids.
Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
doc/examples/muxing.c
ffmpeg.c
ffprobe.c
ffserver.c
libavcodec/8svx.c
libavcodec/avcodec.h
libavcodec/dnxhd_parser.c
libavcodec/dvdsubdec.c
libavcodec/error_resilience.c
libavcodec/h263dec.c
libavcodec/libvorbisenc.c
libavcodec/mjpeg_parser.c
libavcodec/mjpegenc.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/pcm.c
libavcodec/r210dec.c
libavcodec/utils.c
libavcodec/v210dec.c
libavcodec/version.h
libavdevice/alsa-audio-dec.c
libavdevice/bktr.c
libavdevice/v4l2.c
libavformat/asfdec.c
libavformat/asfenc.c
libavformat/avformat.h
libavformat/avidec.c
libavformat/caf.c
libavformat/electronicarts.c
libavformat/flacdec.c
libavformat/flvdec.c
libavformat/flvenc.c
libavformat/framecrcenc.c
libavformat/img2.c
libavformat/img2dec.c
libavformat/img2enc.c
libavformat/ipmovie.c
libavformat/isom.c
libavformat/matroska.c
libavformat/matroskadec.c
libavformat/matroskaenc.c
libavformat/mov.c
libavformat/movenc.c
libavformat/mp3dec.c
libavformat/mpeg.c
libavformat/mpegts.c
libavformat/mxf.c
libavformat/mxfdec.c
libavformat/mxfenc.c
libavformat/nsvdec.c
libavformat/nut.c
libavformat/oggenc.c
libavformat/pmpdec.c
libavformat/rawdec.c
libavformat/rawenc.c
libavformat/riff.c
libavformat/sdp.c
libavformat/utils.c
libavformat/vocenc.c
libavformat/wtv.c
libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at >
2012-08-07 22:45:46 +02:00
8993c25695
avidec: fix AVStream.info memleak with dv.
...
Fixes Ticket1334
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-08-07 19:18:53 +02:00
36ef5369ee
Replace all CODEC_ID_* with AV_CODEC_ID_*
2012-08-07 16:00:24 +02:00
a80ce390df
avidec: parse INFO tags at the end
...
Fixes Ticket1123
Signed-off-by: Michael Niedermayer <michaelni@gmx.at >
2012-08-06 21:36:42 +02:00
