Michael Niedermayer
eff0bf7def
avformat/matroskadec: only set r_frame_rate if the value is within reasonable limits
...
Fixes Ticket2451
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6853e40106
2013-10-24 10:57:14 +02:00
Michael Niedermayer
6559bb893f
avformat/mov: force parsing of headers if stts is absent
...
Fixes Ticket2991
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e41ea866fc
2013-10-24 10:54:46 +02:00
Michael Niedermayer
14e258d847
update for 1.2.4
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03 01:28:06 +02:00
Michael Niedermayer
ca47aec665
Merge remote-tracking branch 'TimothyGu/release/1.2' into release/1.2
...
* TimothyGu/release/1.2:
doc/encoders: add doc for AAC encoder
doc/encoders: improve libvo-aacenc doc
doc/ffmpeg-formats: Add documentation for 3 parameters that have been missing
doc/encoders: Remove options that were not there when branch was cut from master
doc/encoders: reformat and add some clarification in libtwolame doc
doc/encoders: reformat libmp3lame doc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-03 01:18:26 +02:00
Michael Niedermayer
95e26d33d7
avcodec/parser: reset indexes on realloc failure
...
Fixes Ticket2982
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f31011e9ab
2013-10-03 01:04:19 +02:00
Michael Niedermayer
f32051cd73
avcodec/ffv1enc: update buffer check for 16bps
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3728603f18
2013-10-03 01:04:19 +02:00
Michael Niedermayer
c3ee5b4c36
avcodec/truemotion2: Fix av_freep arguments
...
Fixes null pointer dereference
Fixes Ticket2944
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c54aa2fb0f
2013-10-03 01:04:19 +02:00
Michael Niedermayer
c17fd9f9ce
avcodec/mjpegdec: Add some sanity checks to ljpeg_decode_rgb_scan()
...
These prevent the rgb ljpeg code from being run on parameters that it doesnt
support. No testcase available but it seems possible to trigger these.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 61c68000ed
2013-10-03 01:04:18 +02:00
Michael Niedermayer
0f3cdddf38
avfilter/vf_fps: make sure the fifo is not empty before using it
...
Fixes Ticket2905
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cdd5df8189
2013-10-03 01:04:18 +02:00
Michael Niedermayer
a0d13f578b
avcodec/dsputil: fix signedness in sizeof() comparissions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 454a11a1c9
2013-10-03 01:04:18 +02:00
Michael Niedermayer
91e19ab930
ffv1dec: Check bits_per_raw_sample and colorspace for equality in ver 0/1 headers
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b05cd1ea7e
2013-10-03 01:04:18 +02:00
Michael Niedermayer
bb4126e250
ffv1dec: check that global parameters dont change in version 0/1
...
Such changes are not allowed nor supported
Fixes Ticket2906
Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 547d690d67
2013-10-03 01:04:18 +02:00
Michael Niedermayer
9902eef0f5
avcodec/ffv1dec: check global header version
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 20b965a1a4
2013-10-03 01:04:18 +02:00
Timothy Gu
6db67ac2a4
doc/encoders: add doc for AAC encoder
...
Thanks-to: Kostya Shishkov <kostya.shishkov@gmail.com>
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 0e11790cf7
2013-09-22 15:18:16 -07:00
Timothy Gu
85eeab4d22
doc/encoders: improve libvo-aacenc doc
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 81bbe49a0e
2013-09-22 15:16:23 -07:00
Timothy Gu
4431ee1896
doc/ffmpeg-formats: Add documentation for 3 parameters that have been missing
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b7dd459863
2013-09-22 15:14:57 -07:00
Timothy Gu
d2feaf2ba6
doc/encoders: Remove options that were not there when branch was cut from master
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
2013-09-22 14:58:21 -07:00
Timothy Gu
0f73cb454d
doc/encoders: reformat and add some clarification in libtwolame doc
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit e45e72f5f8
2013-09-22 14:58:21 -07:00
Timothy Gu
82cfb8c2db
doc/encoders: reformat libmp3lame doc
...
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 40b8350b57
2013-09-22 14:58:21 -07:00
Clément Bœsch
0a55c882cb
avcodec/srtdec: fix potential overread.
...
(cherry picked from commit 3a54c221d5
2013-09-16 21:39:34 +02:00
Clément Bœsch
c09acf9882
avformat/subtitles: add a next line jumper and use it.
...
This fixes a bunch of possible overread in avformat with the idiom p +=
strcspn(p, "\n") + 1 (strcspn() can focus on the trailing '\0' if no
'\n' is found, so the +1 leads to an overread).
Note on lavf/matroskaenc: no extra subtitles.o Makefile dependency is
added because only the header is required for ff_subtitles_next_line().
Note on lavf/mpsubdec: code gets slightly complex to avoid an infinite
loop in the probing since there is no more forced increment.
NOTE:
Code of function ff_subtitles_next_line fixed by Alexander Strasser.
The original code from master did test the wrong character, but was
corrected by a subsequent commit. That commit however is not backported,
so it had to be fixed in this commit for the backport.
Conflicts:
libavformat/mpl2dec.c
(cherry picked from commit 90fc00a623
2013-09-16 21:39:34 +02:00
Clément Bœsch
a0779a2ee5
avformat/srtdec: skip initial random line breaks.
...
I found a bunch of (recent) SRT files in the wild with 3 to 10 line
breaks at the beginning.
(cherry picked from commit cfcd55db16
2013-09-16 21:39:33 +02:00
Carl Eugen Hoyos
b4f90013ab
Use rc_max_rate if no video bit_rate was specified when muxing mxf_d10.
...
Fixes ticket #2945 .
Reviewed-by: Matthieu Bouron
(cherry picked from commit d73565d5dd
2013-09-12 23:15:49 +02:00
Carl Eugen Hoyos
3a6fbb0c8e
Store the video bit_rate in the context when muxing mxf.
...
This will allow using rc_max_rate if no bit_rate is specified (on remuxing).
Reviewed-by: Matthieu Bouron
(cherry picked from commit 52cf08b4c8
2013-09-12 23:15:44 +02:00
Clément Bœsch
6a782e20d7
avformat/subtitles: check lower bound for duration overlap seeking.
...
(cherry picked from commit 1ca4bf930b
2013-09-10 21:39:16 +02:00
Clément Bœsch
8cea63c48a
avformat/vobsub: fix seeking.
...
(cherry picked from commit f8678dcef3
2013-09-10 21:39:12 +02:00
Paul B Mahol
8f87e75c6c
avformat/matroskaenc: remove bogus prores tag
...
Fixes: ffmpeg -i input -c:v prores output.mkv
Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit 14851ca5f5
2013-09-08 22:12:31 +02:00
Carl Eugen Hoyos
06a927a6b5
Read h264 headers from v4l2 to allow stream-copying.
...
Fixes ticket #2882 .
Analyzed and tested by William C Bonner.
(cherry picked from commit e337c9d564
2013-09-05 22:55:33 +02:00
Paul B Mahol
3c523bdda8
w64dec: fix end position of summarylist guid
...
Noticed-by: James Almer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit 3e36dc8626
2013-09-05 22:55:25 +02:00
Paul B Mahol
ece54c7085
w64dec: fix skipping of unknown guids
...
Regression since 14d50c1Fixes #2932 .
Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit 79b70e47a4
2013-09-05 22:55:15 +02:00
Carl Eugen Hoyos
7eee79ea2f
Avoid a deadlock when decoding wma.
...
Fixes ticket #2925 .
(cherry picked from commit ec8a4841f7
2013-09-02 08:56:32 +02:00
Michael Niedermayer
458933fdb8
avformat/lxfdec: use a parser to parse video frame headers
...
lxf needs a parser (or would need to set a few fields explicitly).
Fixes Ticket2917
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8349be852b
2013-09-01 10:01:25 +02:00
Michael Niedermayer
95d0baa952
avcodec/h264: set er.ref_count earlier
...
Fixes Ticket2910
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 93cf7b0195
2013-09-01 10:01:22 +02:00
Michael Niedermayer
32cff0d3f0
avformat/avidec: match first index and first packet size=0 handling
...
Fixes Ticket2861
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 227a0eb5a9
2013-08-31 09:45:14 +02:00
Michael Niedermayer
ddce97c7b0
avcodec/pngdsp: fix (un)signed type in end comparission
...
Fixes out of array accesses
Fixes Ticket2919
Found_by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 86736f59d6
2013-08-30 23:37:31 +02:00
Stefano Sabatini
26617b47fa
doc/codecs: fix dangling reference to codec-options chapter
...
(cherry picked from commit b4bd21b7fe
2013-08-27 01:21:34 +02:00
Michael Niedermayer
b3fb651a8a
update for 1.2.3
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-27 00:26:24 +02:00
Stefano Sabatini
2da5b69020
doc/filters: review introductory example and explanation
...
In particular, fix wrong vertical mirroring command, and clarify
and extend explanation.
Based on a patch by littlebat <dashing.meng@gmail.com>.
Should fix trac ticket #2413 .
(cherry picked from commit 215ca86475
2013-08-26 12:00:03 -07:00
Timothy Gu
b23642aa7e
doc/encoders: add libxvid doc
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 6b255e5e70
2013-08-26 11:29:32 -07:00
Timothy Gu
eae4dfd4e8
doc/encoders: partially rewrite and reformat libx264 docs
...
Format is based on the thread:
"[PATCH] doc/encoders: Add libopus encoder doc" (06-28-2013)
http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/165368/
Also merge the two option sections (Mapping and Private options).
Patch partially edited by Stefano Sabatini.
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 11cb697501
2013-08-26 11:29:16 -07:00
Timothy Gu
6fb2c03e1a
doc/encoders: add libopus encoder doc
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 561e05136f
2013-08-26 11:29:14 -07:00
Timothy Gu
1d6b261a24
doc/muxers: Add AIFF doc
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 4ec46b1160
2013-08-26 11:28:25 -07:00
Timothy Gu
02f1ae5406
doc/decoders: document libopus decoder
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 7eb5288f17
2013-08-26 11:28:25 -07:00
Timothy Gu
aaac34f5e6
doc/encoders: alphabetically list the encoders
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 934df3b037
2013-08-26 11:27:39 -07:00
Timothy Gu
7858d261aa
doc/decoders: Add libopencore-amrwb decoder doc
...
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
(cherry picked from commit 83647ace73
2013-08-26 11:27:08 -07:00
Timothy Gu
f85c44264b
doc/decoders: Document libopencore-amrnb decoder
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b43860ee0c
2013-08-26 11:27:08 -07:00
Timothy Gu
025e286757
doc/decoders: Document libilbc decoder
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8cdea50f6e
2013-08-26 11:27:08 -07:00
Timothy Gu
79ec45a455
doc/decoders: Document libgsm decoder
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c16496c377
2013-08-26 11:27:08 -07:00
Timothy Gu
09653c5444
doc/encoders: Add libopencore-amrnb doc
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9ead06057a
2013-08-26 11:27:01 -07:00
Timothy Gu
c788713589
doc/decoders: Document libcelt
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e358044922
2013-08-26 09:26:22 -07:00
