delta/ffmpeg.git, branch release/1.2 git.ffmpeg.org: ffmpeg.git avcodec/h264_mp4toannexb_bsf: Reorder operations in nal_size check 2015-10-09T23:22:43+00:00 Michael Niedermayer michael@niedermayer.cc 2015-08-21T00:49:21+00:00 17788711ac4390f490d958590e218f45199950c4 Fixes Ticket4778 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 2bb54b82b5094fd906aa28c0443be08c95662a31) 
Fixes Ticket4778

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 2bb54b82b5094fd906aa28c0443be08c95662a31)
avformat/oggenc: Check segments_count for headers too 2015-10-09T23:22:29+00:00 Michael Niedermayer michael@niedermayer.cc 2015-08-27T02:08:42+00:00 30c644afebb991b61dec313cc2d6a01971b60532 Fixes infinite loop and segfault in ogg_buffer_data() Fixes Ticket4806 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 81a8701eb52d2b6469ae16ef442ce425388141b7) 
Fixes infinite loop and segfault in ogg_buffer_data()
Fixes Ticket4806

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 81a8701eb52d2b6469ae16ef442ce425388141b7)
avformat/avidec: Workaround broken initial frame 2015-10-09T23:22:12+00:00 Michael Niedermayer michael@niedermayer.cc 2015-09-15T02:01:27+00:00 0cdeacf41b5473c64007cd3b0b26f763758222d3 Fixes Ticket4851 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 3e2ef00394b8079e93835d47c993868229f07502) Conflicts: libavformat/avidec.c 
Fixes Ticket4851

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 3e2ef00394b8079e93835d47c993868229f07502)

Conflicts:
	libavformat/avidec.c
avcodec/mp3: fix skipping zeros 2015-10-09T23:21:20+00:00 wm4 nfxjfg@googlemail.com 2015-09-30T12:53:35+00:00 928473a1872c1b2f364c98f674a83d7882993cc2 Commits 43bc5cf9 and c5371f77 add code for skipping initial zeros in mp3 packets. This code forgot to report to the user that data was skipped at all. Since audio codecs allow partial packet decoding, the user application has to rely on the return value. It will remove the data reported as consumed by the decoder, and feed it to the decoder again. This resulted in the mp3 frame after the zero region to be decoded over and over again, until the zero region was finally skipped by the application. Fix this by including the amount of skipped bytes to the number of consumed bytes returned by the decode call. Fixes trac ticket #4890. (cherry picked from commit cb1da9fb8d71bb611a7b0028914c97afc3f5711d) 
Commits 43bc5cf9 and c5371f77 add code for skipping initial zeros in mp3
packets. This code forgot to report to the user that data was skipped at
all.

Since audio codecs allow partial packet decoding, the user application
has to rely on the return value. It will remove the data reported as
consumed by the decoder, and feed it to the decoder again. This resulted
in the mp3 frame after the zero region to be decoded over and over
again, until the zero region was finally skipped by the application.

Fix this by including the amount of skipped bytes to the number of
consumed bytes returned by the decode call.

Fixes trac ticket #4890.
(cherry picked from commit cb1da9fb8d71bb611a7b0028914c97afc3f5711d)
MAINTAINERS: Remove myself as leader 2015-07-31T16:35:34+00:00 Michael Niedermayer michael@niedermayer.cc 2015-07-31T13:54:38+00:00 43919b69226359498936d05d97e640dec3dc0156 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit f2c58931e629343f7d68258cc2b2d62c5f501ba5) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit f2c58931e629343f7d68258cc2b2d62c5f501ba5)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
avformat/swfdec: Do not error out on pixel format changes 2015-07-08T10:55:55+00:00 Michael Niedermayer michaelni@gmx.at 2015-07-08T00:43:02+00:00 bd8d8f57e87b853176d373b2eb375031a9fb8966 Instead print an error and continue Fixes Ticket4702 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 6a1204a1a46674084b1e6b92562f81aaab7aac69) 
Instead print an error and continue

Fixes Ticket4702

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6a1204a1a46674084b1e6b92562f81aaab7aac69)
avcodec/x86/h264_weight: handle weight1=128 2015-06-19T09:57:16+00:00 Michael Niedermayer michaelni@gmx.at 2015-06-09T03:11:09+00:00 581bfd9c6f3a30a3859d2fc8b09f85ee0ccc1f25 Fix ticket4596 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit e1009665759d4a3938dd2dd07b7e84d8bc9c5290) 
Fix ticket4596

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e1009665759d4a3938dd2dd07b7e84d8bc9c5290)
avfilter/x86/vf_hqdn3d: Fix register types 2015-06-19T09:56:59+00:00 Michael Niedermayer michaelni@gmx.at 2015-05-27T02:31:30+00:00 1218e9d73dc3ca8218ad56ce0e275116d499dd59 Fixes Ticket4301 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 52fc3e372f8ed4de5735abed1f7f7569fe37b023) 
Fixes Ticket4301

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 52fc3e372f8ed4de5735abed1f7f7569fe37b023)
Update for FFmpeg 1.2.12 2015-02-12T13:28:03+00:00 Michael Niedermayer michaelni@gmx.at 2015-02-12T13:28:03+00:00 2515907a45a99d3354ba0d3f29d9a59ba15f3593 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/mjpegdec: Skip blocks which are outside the visible area 2015-02-11T10:59:23+00:00 Michael Niedermayer michaelni@gmx.at 2015-02-11T02:33:53+00:00 7e7772c13ad8c75786f3980ad4e118158697d4db Fixes out of array accesses Fixes: ffmpeg_mjpeg_crash.avi Found-by: Thomas Lindroth <thomas.lindroth@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 08509c8f86626815a3e9e68d600d1aacbb8df4bf) Conflicts: libavcodec/mjpegdec.c (cherry picked from commit b881a97b9977b79dfe3ce02d61542c630fe78c14) Signed-off-by: Michael Niedermayer <michaelni@gmx.at> 
Fixes out of array accesses
Fixes: ffmpeg_mjpeg_crash.avi

Found-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 08509c8f86626815a3e9e68d600d1aacbb8df4bf)

Conflicts:

	libavcodec/mjpegdec.c
(cherry picked from commit b881a97b9977b79dfe3ce02d61542c630fe78c14)

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