delta/ffmpeg.git, branch n2.0.2 git.ffmpeg.org: ffmpeg.git doc/codecs: fix dangling reference to codec-options chapter 2013-10-08T18:57:07+00:00 Stefano Sabatini stefasab@gmail.com 2013-07-27T14:50:19+00:00 9d0bb7fc3991b030603acfe899e6f001e530c89a (cherry picked from commit b4bd21b7fe2ad8be59b16538448586814e5db65b) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
(cherry picked from commit b4bd21b7fe2ad8be59b16538448586814e5db65b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
update for 2.0.2 2013-10-08T17:39:58+00:00 Michael Niedermayer michaelni@gmx.at 2013-10-08T17:39:58+00:00 a53fd4b7584a0cbf5dd51cf8182f2ac7e4588a05 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/ffv1dec: fix format detection 2013-10-08T16:13:55+00:00 Paul B Mahol onemda@gmail.com 2013-09-09T10:44:27+00:00 b4ccdf5e68c0edc7667b33a61ed15d537579ccc3 Fixes crash with carefuly designed files. Signed-off-by: Paul B Mahol <onemda@gmail.com> (cherry picked from commit a27227d401adf12534dc7a26d72e43e2f35f8944) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
Fixes crash with carefuly designed files.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit a27227d401adf12534dc7a26d72e43e2f35f8944)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/parser: reset indexes on realloc failure 2013-10-08T16:13:55+00:00 Michael Niedermayer michaelni@gmx.at 2013-09-26T19:03:48+00:00 9b02aa25937ff0990b7d8558f04293384d682eb1 Fixes Ticket2982 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f31011e9abfb2ae75bb32bc44e2c34194c8dc40a) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
Fixes Ticket2982

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f31011e9abfb2ae75bb32bc44e2c34194c8dc40a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/imgconvert/get_color_type: fix type for PAL8 2013-10-02T21:47:41+00:00 Michael Niedermayer michaelni@gmx.at 2013-10-02T16:11:28+00:00 f089e67d515b726ac14103025edc04f6df346a3f Fixes Ticket3008 Fate changes as PAL8 gets used instead of BGR8 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 95666b22989b9b9f91a27da01b2bdbf4ee8022d3) 
Fixes Ticket3008

Fate changes as PAL8 gets used instead of BGR8

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 95666b22989b9b9f91a27da01b2bdbf4ee8022d3)
configure: fix logic for threads in case of OpenCL is enabled. 2013-10-02T21:44:39+00:00 Thilo Borgmann thilo.borgmann@mail.de 2013-10-01T14:49:39+00:00 842d7c9b3af0ea6327bbc8b4554f5fa35f3b73ac Fixes ticket 3004. Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit d3a03d90a3d57cdc6f915a05f5f28ee4bb470d00) 
Fixes ticket 3004.

Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d3a03d90a3d57cdc6f915a05f5f28ee4bb470d00)
Merge remote-tracking branch 'TimothyGu/release/2.0' into release/2.0 2013-09-23T20:31:44+00:00 Michael Niedermayer michaelni@gmx.at 2013-09-23T20:31:41+00:00 187297b871a3dca9c90dac5aa6cd65f9c8edb240 * TimothyGu/release/2.0: doc/encoders: add doc for AAC encoder doc/formats: Add documentation for 3 parameters that have been missing doc/encoders: improve libvo-aacenc doc doc/encoders: reformat and add some clarification in libtwolame doc doc/encoders: reformat libmp3lame doc doc/encoders: add libxvid doc doc/encoders: partially rewrite and reformat libx264 docs Merged-by: Michael Niedermayer <michaelni@gmx.at> 
* TimothyGu/release/2.0:
  doc/encoders: add doc for AAC encoder
  doc/formats: Add documentation for 3 parameters that have been missing
  doc/encoders: improve libvo-aacenc doc
  doc/encoders: reformat and add some clarification in libtwolame doc
  doc/encoders: reformat libmp3lame doc
  doc/encoders: add libxvid doc
  doc/encoders: partially rewrite and reformat libx264 docs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'jamrial/release/2.0' into release/2.0 2013-09-23T20:30:49+00:00 Michael Niedermayer michaelni@gmx.at 2013-09-23T20:30:42+00:00 211ad5042adcf9f6e8abb9d0f1f3316331481535 * jamrial/release/2.0: avformat/matroskadec: check out_samplerate before using it in av_rescale() matroskadec: Improve TTA duration calculation avformat/oggparsevorbis: fix leak of tt avformat/oggparsevorbis: fix leak of ct Merged-by: Michael Niedermayer <michaelni@gmx.at> 
* jamrial/release/2.0:
  avformat/matroskadec: check out_samplerate before using it in av_rescale()
  matroskadec: Improve TTA duration calculation
  avformat/oggparsevorbis: fix leak of tt
  avformat/oggparsevorbis: fix leak of ct

Merged-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/g2meet: Fix framebuf size 2013-09-23T19:46:15+00:00 Michael Niedermayer michaelni@gmx.at 2013-09-21T21:34:11+00:00 2b06f5f8f15a4464c74405cd7da57da2d6be5d36 Currently the code can in some cases draw tiles that hang outside the allocated buffer. This patch increases the buffer size to avoid out of array accesses. An alternative would be to fail if such tiles are encountered. I do not know if any valid files use such hanging tiles. Fixes Ticket2971 Found-by: ami_stuff Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e07ac727c1cc9eed39e7f9117c97006f719864bd) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
Currently the code can in some cases draw tiles that hang outside the
allocated buffer. This patch increases the buffer size to avoid out
of array accesses. An alternative would be to fail if such tiles are
encountered.
I do not know if any valid files use such hanging tiles.

Fixes Ticket2971
Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e07ac727c1cc9eed39e7f9117c97006f719864bd)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/g2meet: Fix order of align and pixel size multiplication. 2013-09-23T19:46:15+00:00 Michael Niedermayer michaelni@gmx.at 2013-09-15T14:33:27+00:00 0a64b25c77320577a54203b2c7e5f3da4ae36e40 Fixes out of array accesses Fixes Ticket2922 Found-by: ami_stuff Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 821a5938d100458f4d09d634041b05c860554ce0) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
Fixes out of array accesses
Fixes Ticket2922

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 821a5938d100458f4d09d634041b05c860554ce0)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>