ffmpeg.git
6 years agoupdate for 1.0.1 n1.0.1
Michael Niedermayer [Mon, 3 Dec 2012 20:28:45 +0000 (21:28 +0100)]
update for 1.0.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoqdm2: check array index before use, fix out of array accesses
Michael Niedermayer [Fri, 30 Nov 2012 22:59:40 +0000 (23:59 +0100)]
qdm2: check array index before use, fix out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a7ee6281f7ef1c29284e3a4cadfe0f227ffde1ed)

6 years agohuffyuvdec: check width more completely, avoid out of array accesses
Michael Niedermayer [Thu, 29 Nov 2012 14:56:05 +0000 (15:56 +0100)]
huffyuvdec: check width more completely, avoid out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6abb9a901fca27da14d4fffbb01948288b5da3ba)

6 years agoroqvideodec: check dimensions validity
Michael Niedermayer [Thu, 29 Nov 2012 14:18:17 +0000 (15:18 +0100)]
roqvideodec: check dimensions validity

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3ae610451170cd5a28b33950006ff0bd23036845)

6 years agoh264: correct ref count check and limit, fix out of array accesses.
Michael Niedermayer [Sun, 18 Nov 2012 15:29:04 +0000 (16:29 +0100)]
h264: correct ref count check and limit, fix out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d6c184880ee2e09fd68c0ae217173832cee5afc1)

6 years agoeamad: fix out of array accesses
Michael Niedermayer [Sat, 17 Nov 2012 15:26:55 +0000 (16:26 +0100)]
eamad: fix out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 63ac64864c6e0e84355aa3caa5b92208997a9a8d)

6 years agopgssubdec: check RLE size before copying. Fix out of array accesses
Michael Niedermayer [Thu, 15 Nov 2012 15:41:28 +0000 (16:41 +0100)]
pgssubdec: check RLE size before copying. Fix out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c0d68be555f5858703383040e04fcd6529777061)

6 years agowavpack: fix out of array access
Michael Niedermayer [Mon, 12 Nov 2012 13:42:45 +0000 (14:42 +0100)]
wavpack: fix out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit be818df547c3b0ae4fadb50fd210139a8636706a)

6 years agomjpegdec: check SE.
Michael Niedermayer [Sat, 10 Nov 2012 23:01:24 +0000 (00:01 +0100)]
mjpegdec: check SE.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoalac: fix integer overflow leading to subsequent out of array accesses.
Michael Niedermayer [Sat, 10 Nov 2012 16:41:56 +0000 (17:41 +0100)]
alac: fix integer overflow leading to subsequent out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3920d1387834e2bc334aff9f518f4beb24e470bd)

6 years agoalac: fix nb_samples < order case
Michael Niedermayer [Sat, 10 Nov 2012 16:14:04 +0000 (17:14 +0100)]
alac: fix nb_samples < order case

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fd4f4923cce6a2cbf4f48640b4ac706e614a1594)

6 years agoiff/ilbm: check remaining buffer size.
Michael Niedermayer [Fri, 9 Nov 2012 19:58:57 +0000 (20:58 +0100)]
iff/ilbm: check remaining buffer size.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2fbb37b51bbea891392ad357baf8f3dff00bac05)

Conflicts:

libavcodec/iff.c

6 years agotiffdec: check count in metadata reading.
Michael Niedermayer [Fri, 9 Nov 2012 11:13:30 +0000 (12:13 +0100)]
tiffdec: check count in metadata reading.

Fixes out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6d1c5ea04af3e345232aa70c944de961061dab2d)

6 years agoswr: use 64bit index/len for x86_64 mix
Michael Niedermayer [Sun, 28 Oct 2012 00:09:08 +0000 (02:09 +0200)]
swr: use 64bit index/len for x86_64 mix

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

6 years agompegvideo enc: choose VBV buffer size for mpeg4 when none is specified instead of...
Michael Niedermayer [Tue, 23 Oct 2012 22:38:56 +0000 (00:38 +0200)]
mpegvideo enc: choose VBV buffer size for mpeg4 when none is specified instead of failing

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo enc: choose VBV buffer size for mpeg1/2 when none is specified instead...
Michael Niedermayer [Tue, 23 Oct 2012 22:03:06 +0000 (00:03 +0200)]
mpegvideo enc: choose VBV buffer size for mpeg1/2 when none is specified instead of failing

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffv1: fix array data types
Michael Niedermayer [Mon, 8 Oct 2012 00:11:25 +0000 (02:11 +0200)]
ffv1: fix array data types

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomovenc: fix regression with yuyv caused by c5f23d
Michael Niedermayer [Sat, 6 Oct 2012 18:19:05 +0000 (20:19 +0200)]
movenc: fix regression with yuyv caused by c5f23d

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibvorbisenc: fix afq delay setting
Michael Niedermayer [Sat, 6 Oct 2012 09:50:38 +0000 (11:50 +0200)]
libvorbisenc: fix afq delay setting

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaacenc: fix out of array writes
Michael Niedermayer [Thu, 4 Oct 2012 20:54:29 +0000 (22:54 +0200)]
aacenc: fix out of array writes

The value used in allocation is based on a estimate of the
maximum size of the spectral coefficients multiplied with 2
and rounded up. The exact or a tighter limit should be
found and used instead. But this issue shouldnt be left
open until someone works on that.

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffserver: fix potential buffer overflow, based on wrong fscanf format indentifier.
Martin Ettl [Tue, 2 Oct 2012 20:57:25 +0000 (22:57 +0200)]
ffserver: fix potential buffer overflow, based on wrong fscanf format indentifier.

Fixed Ticket1780

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: Fix --disable-zlib
jamal [Sat, 29 Sep 2012 03:41:32 +0000 (00:41 -0300)]
fate: Fix --disable-zlib

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: free probe data in case we close before probing finished
Michael Niedermayer [Sat, 29 Sep 2012 15:33:05 +0000 (17:33 +0200)]
lavf: free probe data in case we close before probing finished

Fixes Ticket1634

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffv1enc: fix integer overflow with high resolutions and lots of slices.
Michael Niedermayer [Sat, 29 Sep 2012 17:11:25 +0000 (19:11 +0200)]
ffv1enc: fix integer overflow with high resolutions and lots of slices.

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: add missing dependancies for gpl tests
Michael Niedermayer [Fri, 28 Sep 2012 03:25:22 +0000 (05:25 +0200)]
configure: add missing dependancies for gpl tests

fixes fate without --enable-gpl

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf/swfdec: fix flushing with compressed swf.
Clément Bœsch [Fri, 12 Oct 2012 16:23:46 +0000 (18:23 +0200)]
lavf/swfdec: fix flushing with compressed swf.

We now only return in the middle of the refill in case of read error, so
inflate can be re-called if zlib needs an empty (z.avail_in=0) inflate
call for flushing.

6 years agotests/Makefile: fix ffprobe test dependancy n1.0
Michael Niedermayer [Fri, 28 Sep 2012 00:58:35 +0000 (02:58 +0200)]
tests/Makefile: fix ffprobe test dependancy

This fixes the ffprobe tests under mingw/wine

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoasfenc: avoid negative timestamps
Michael Niedermayer [Fri, 28 Sep 2012 00:31:07 +0000 (02:31 +0200)]
asfenc: avoid negative timestamps

Fixes Ticket1606

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

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRevert "ffprobe: Add a few common disposition cases"
Michael Niedermayer [Fri, 28 Sep 2012 00:24:05 +0000 (02:24 +0200)]
Revert "ffprobe: Add a few common disposition cases"

revert requested by ubitux for 1.0

This reverts commit 8e2a950b297b97605e97c454363f2f8555b004f0.

6 years agoUpdate for 1.0
Michael Niedermayer [Fri, 28 Sep 2012 00:18:32 +0000 (02:18 +0200)]
Update for 1.0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomp3dec: Fix possibly exploitable crash
Michael Niedermayer [Thu, 27 Sep 2012 23:38:44 +0000 (01:38 +0200)]
mp3dec: Fix possibly exploitable crash

I was sadly unable to find a non fuzzed mp3 that uses the
feature that contained the bug (and i searched hard ...), thus
while this fixes the security issue. It may or may not fix
mixed blocks in 8khz mp3s, i cant say due to lack of samples to test.

Security issue exists since: b37d945dd4213cb8e92146571b0374cd45d52286

Reported-by: Dale Curtis <dalecurtis@google.com>
(Probably) Found-by: inferno@chromium.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomxfdec: allow container_ul to override codec_ul if codec is A-law
Marton Balint [Wed, 26 Sep 2012 22:24:46 +0000 (00:24 +0200)]
mxfdec: allow container_ul to override codec_ul if codec is A-law

Fixes some DNXHD files generated by AVID TM, where codec UL was set to A-law
meanwhile the real audio codec was PCM S16. According to SMPTE RP 224, A-law is
the default value for sound essence parameters therefore we should handle it
specially.

Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoChangelog, split next from 1.0
Michael Niedermayer [Thu, 27 Sep 2012 18:25:53 +0000 (20:25 +0200)]
Changelog, split next from 1.0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo_enc: reduce QMAT_SHIFT to avoid overflow in dnxhd
Michael Niedermayer [Thu, 20 Sep 2012 20:29:03 +0000 (22:29 +0200)]
mpegvideo_enc: reduce QMAT_SHIFT to avoid overflow in dnxhd

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/sink_buffer: implement libav compatibility API.
Nicolas George [Sun, 23 Sep 2012 18:45:49 +0000 (20:45 +0200)]
lavfi/sink_buffer: implement libav compatibility API.

Implement av_buffersink_read() and av_buffersink_read_samples()
for ffmpeg's version of buffersink.

With this change, avconv linked against ffmpeg's libraries passes
the same number of tests whether it uses ffbuffersink or
buffersink_old.

6 years agolavf: move fields that appear to be intended as public API to the correct section
Michael Niedermayer [Wed, 26 Sep 2012 13:24:00 +0000 (15:24 +0200)]
lavf: move fields that appear to be intended as public API to the correct section

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodsputil_mmx: fix reading prior of the src array in sub_hfyu_median_prediction()
Michael Niedermayer [Thu, 27 Sep 2012 13:52:21 +0000 (15:52 +0200)]
dsputil_mmx: fix reading prior of the src array in sub_hfyu_median_prediction()

This should fix the utvideoenc valgrind failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: enable buffersinks unconditionally.
Nicolas George [Wed, 26 Sep 2012 09:59:56 +0000 (11:59 +0200)]
lavfi: enable buffersinks unconditionally.

They are part of the public API. Their libav compatibility
counterpart are already enabled unconditionally.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 27 Sep 2012 12:23:23 +0000 (14:23 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  nutdec: const correctness for get_v_trace/get_s_trace function arguments
  truemotion2: Request samples for old TM2 headers
  rtpdec: Remove a useless ff_ prefix from a static symbol
  rtpdec: Support depacketizing speex
  rtpenc: Add support for packetizing speex

Conflicts:
libavformat/rtpdec.c
libavformat/sdp.c
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: add faststart regression test.
Clément Bœsch [Mon, 24 Sep 2012 07:36:09 +0000 (09:36 +0200)]
fate: add faststart regression test.

Also factorize the common options for the different mov-based tests.

Since the header is now on top in the last generated file, the data
offset in the seek test needed some updates as well.

6 years agolavf/movenc: add faststart option.
Clément Bœsch [Thu, 20 Sep 2012 08:40:10 +0000 (10:40 +0200)]
lavf/movenc: add faststart option.

6 years agolavf/movenc: make mov_write_stco_tag() not use the offset pos for mode64 heuristic.
Clément Bœsch [Thu, 20 Sep 2012 08:39:04 +0000 (10:39 +0200)]
lavf/movenc: make mov_write_stco_tag() not use the offset pos for mode64 heuristic.

At the moment, the moov header is written at the end of the file, so we
can use the current offset (which focus on the end of the mdat already
written) to guess if 64-bits offset will be required or not.

Though, the next commits will make possible the writing of this table at
the beginning, so this heuristic can't work. As a consequence, we check
all the values within the potential offset table for any value >
32-bits.

6 years agolavf/movenc: add get_moov_size and use it in fragment code.
Clément Bœsch [Thu, 20 Sep 2012 08:34:28 +0000 (10:34 +0200)]
lavf/movenc: add get_moov_size and use it in fragment code.

This function will be re-used in the following commits.

6 years agoffmpeg: add option to control copying of frames prior to start.
Michael Niedermayer [Thu, 27 Sep 2012 01:37:27 +0000 (03:37 +0200)]
ffmpeg: add option to control copying of frames prior to start.

Normally we discard things prior to the intended start
for stream copy this is not always possible, and its not done by default
this option allows discarding to be enabled

this is primarely usefull when transcoding a video and stream copying an
audio stream.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofile: set the return value type for lseek to off_t
Jean First [Wed, 26 Sep 2012 23:08:51 +0000 (01:08 +0200)]
file: set the return value type for lseek to off_t

fixes a bug introduced with 4ed5ac50d3e4f921003ecf60985f78337400f354

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRELEASE: update for 1.0
Michael Niedermayer [Wed, 26 Sep 2012 22:03:15 +0000 (00:03 +0200)]
RELEASE: update for 1.0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMAINTAINERS: add 1.0
Michael Niedermayer [Wed, 26 Sep 2012 21:50:44 +0000 (23:50 +0200)]
MAINTAINERS: add 1.0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffprobe: fix indentation of the first line of packets_and_frames sections in the...
Stefano Sabatini [Wed, 26 Sep 2012 22:45:16 +0000 (00:45 +0200)]
ffprobe: fix indentation of the first line of packets_and_frames sections in the json output

6 years agolavf: fill in past dts based on reordered pts once the delay becomes known.
Michael Niedermayer [Wed, 26 Sep 2012 20:54:57 +0000 (22:54 +0200)]
lavf: fill in past dts based on reordered pts once the delay becomes known.

Previously we had ignored the past dts and just filled in from the
point where we have had sufficient information.

This should fix Ticket1734

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: factorize timestamp shift in update_initial_timestamps()
Michael Niedermayer [Wed, 26 Sep 2012 20:52:33 +0000 (22:52 +0200)]
lavf: factorize timestamp shift in update_initial_timestamps()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: allow printing muxer side packet timestamp debuging info
Michael Niedermayer [Wed, 26 Sep 2012 19:56:01 +0000 (21:56 +0200)]
ffmpeg: allow printing muxer side packet timestamp debuging info

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agonutdec: const correctness for get_v_trace/get_s_trace function arguments
Diego Biurrun [Tue, 25 Sep 2012 17:02:42 +0000 (19:02 +0200)]
nutdec: const correctness for get_v_trace/get_s_trace function arguments

6 years agotruemotion2: Request samples for old TM2 headers
Diego Biurrun [Wed, 26 Sep 2012 16:42:16 +0000 (18:42 +0200)]
truemotion2: Request samples for old TM2 headers

6 years agortpdec: Remove a useless ff_ prefix from a static symbol
Martin Storsjö [Sun, 23 Sep 2012 10:32:41 +0000 (13:32 +0300)]
rtpdec: Remove a useless ff_ prefix from a static symbol

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpdec: Support depacketizing speex
Dmitry Samonenko [Sat, 22 Sep 2012 10:39:03 +0000 (14:39 +0400)]
rtpdec: Support depacketizing speex

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpenc: Add support for packetizing speex
Dmitry Samonenko [Sat, 22 Sep 2012 10:32:37 +0000 (14:32 +0400)]
rtpenc: Add support for packetizing speex

This packetization scheme simply places the full packets into the
RTP packet without any extra header bytes.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoRevert "arm/h264: fix overreads in h264_chroma_mc8-and-h264_chroma_mc4"
Michael Niedermayer [Wed, 26 Sep 2012 15:31:25 +0000 (17:31 +0200)]
Revert "arm/h264: fix overreads in h264_chroma_mc8-and-h264_chroma_mc4"

This reverts commit d25f87f5174df5923be7ce0bb89fad08999286ed.

This breaks decoding of some h264 files
I have tested the original patch with fate but by mistake have
forgotten to specify the fate samples so testing was limited to
the internal regression tests.

6 years agoffv1dec: support decoding older 1.3 bitstream variant
Michael Niedermayer [Wed, 26 Sep 2012 15:04:29 +0000 (17:04 +0200)]
ffv1dec: support decoding older 1.3 bitstream variant

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffv1:update copyright year
Michael Niedermayer [Wed, 26 Sep 2012 15:00:15 +0000 (17:00 +0200)]
ffv1:update copyright year

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agonutenc: avoid negative timestamps
Michael Niedermayer [Wed, 26 Sep 2012 13:56:06 +0000 (15:56 +0200)]
nutenc: avoid negative timestamps

Fixes Ticket1468

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: Add support offset timestamps on muxing.
Michael Niedermayer [Wed, 26 Sep 2012 13:55:16 +0000 (15:55 +0200)]
lavf: Add support offset timestamps on muxing.

This allows avoiding negative timestamps.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agonutenc: remove outdated fixme
Michael Niedermayer [Wed, 26 Sep 2012 13:53:17 +0000 (15:53 +0200)]
nutenc: remove outdated fixme

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 26 Sep 2012 11:45:47 +0000 (13:45 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  xsub: feed init_get_bits the whole buffer
  libfdk-aac: Allow setting VBR modes via a private option
  libfdk-aac: Warn the user that the VBR modes are unsupported
  Revert "cbrt_tablegen: Include libm.h"

Conflicts:
libavcodec/xsubdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffprobe: generalize writer subsection nesting model
Stefano Sabatini [Mon, 17 Sep 2012 19:08:09 +0000 (21:08 +0200)]
ffprobe: generalize writer subsection nesting model

Discard unflexible structure based on the root/chapter/section layout in
favor of a generalized concept of section.

This should allow to represent sections at a generic level of nesting,
and allow subsection fields selection.

Also, simplify the code.

6 years agolavf: fix bug that caused has_decode_delay_been_guessed() to never return !=0
Michael Niedermayer [Wed, 26 Sep 2012 02:53:03 +0000 (04:53 +0200)]
lavf: fix bug that caused has_decode_delay_been_guessed() to never return !=0

Possibly fixes Ticket1724

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoHandle the following type of relative URL correctly:
Duncan Salerno [Tue, 25 Sep 2012 18:19:32 +0000 (19:19 +0100)]
Handle the following type of relative URL correctly:

http://a/b + //c/d = http://c/d
http://a/b?c + ?d = http://a/b?d
http://a/b?c/d + /e = http://a/e

Updated with feedback from Clément Bœsch

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodiracyasm: fix win64
Michael Niedermayer [Tue, 25 Sep 2012 23:54:42 +0000 (01:54 +0200)]
diracyasm: fix win64

Fixes Ticket1412

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibx264: fix open GOP
Michael Niedermayer [Tue, 25 Sep 2012 22:32:50 +0000 (00:32 +0200)]
libx264: fix open GOP

Found-by: relaxed
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Fix 10l in 5ae9fa13f5ac640bec113120d540f70971aa635d
Derek Buitenhuis [Tue, 25 Sep 2012 22:21:14 +0000 (18:21 -0400)]
configure: Fix 10l in 5ae9fa13f5ac640bec113120d540f70971aa635d

Wrong version of the patch was pushed. MinGW32 supports vsnprint properly.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMinGW: Use our snprintf/vsnprintf when MinGW's is broken
Derek Buitenhuis [Mon, 24 Sep 2012 22:44:20 +0000 (18:44 -0400)]
MinGW: Use our snprintf/vsnprintf when MinGW's is broken

All versions of MinGW-w64 prior to version 3, as well as
all versions of MinGW32 have broken implementations of
vsnprintf.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoffmpeg: avoid apics for video output if possible
Michael Niedermayer [Tue, 25 Sep 2012 22:02:19 +0000 (00:02 +0200)]
ffmpeg: avoid apics for video output if possible

Fixes Ticket1714

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: factor area out of video stream selection code.
Michael Niedermayer [Tue, 25 Sep 2012 21:59:34 +0000 (23:59 +0200)]
ffmpeg: factor area out of video stream selection code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomlpdec: supress layout mismatch warnings for 2 ch upmixed mono
Michael Niedermayer [Tue, 25 Sep 2012 20:45:52 +0000 (22:45 +0200)]
mlpdec: supress layout mismatch warnings for 2 ch upmixed mono

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomlpdec: discard a 2nd substream if the stream is mono
Michael Niedermayer [Tue, 25 Sep 2012 20:36:45 +0000 (22:36 +0200)]
mlpdec: discard a 2nd substream if the stream is mono

This fixes the rest of Ticket1726

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomlp_parser: dont override existing channel geometry.
Michael Niedermayer [Tue, 25 Sep 2012 20:35:26 +0000 (22:35 +0200)]
mlp_parser: dont override existing channel geometry.

This prevents race conditions
And partly fixes Ticket1726

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoxsub: feed init_get_bits the whole buffer
Alexandre Colucci [Mon, 2 May 2011 16:55:02 +0000 (18:55 +0200)]
xsub: feed init_get_bits the whole buffer

Do not use rlelen field for buffer size in init_get_bits, it is
only the size of the data for the first field.
Since it is not reliable, just use the size of the whole buffer.

Additional comments add removal of unused rlelen variable by
Reimar Döffinger.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoarm/h264: fix overreads in h264_chroma_mc8-and-h264_chroma_mc4
bruce-wu [Sat, 22 Sep 2012 05:02:15 +0000 (13:02 +0800)]
arm/h264: fix overreads in h264_chroma_mc8-and-h264_chroma_mc4

Fixes Ticket1227

6 years agolibfdk-aac: Allow setting VBR modes via a private option
Martin Storsjö [Tue, 25 Sep 2012 05:37:21 +0000 (08:37 +0300)]
libfdk-aac: Allow setting VBR modes via a private option

This avoids using the global_quality field and QSCALE flag for
passing the VBR modes, since the value range of the global_quality
field doesn't really map cleanly to this codec's VBR modes.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolibfdk-aac: Warn the user that the VBR modes are unsupported
Martin Storsjö [Tue, 25 Sep 2012 05:31:44 +0000 (08:31 +0300)]
libfdk-aac: Warn the user that the VBR modes are unsupported

These modes were not originally exposed by the library at all.
In practice, only a few of them work for each sample rate/profile
combination, and they don't work at all for the more uncommon
sample rates.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoRevert "cbrt_tablegen: Include libm.h"
Derek Buitenhuis [Tue, 25 Sep 2012 16:54:26 +0000 (12:54 -0400)]
Revert "cbrt_tablegen: Include libm.h"

This code runs on the host and should not use libm.h, which is meant
for the target.

This reverts commit 2768b717987d4e19d2774890d7d84aef531b1d9f.

6 years agodnxhdenc: fix speed regression
Michael Niedermayer [Tue, 25 Sep 2012 16:05:02 +0000 (18:05 +0200)]
dnxhdenc: fix speed regression

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo: factorize ff_dct_encode_init()
Michael Niedermayer [Tue, 25 Sep 2012 16:04:36 +0000 (18:04 +0200)]
mpegvideo: factorize ff_dct_encode_init()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodnxhdenc: remove redundant call to ff_dsputil_init()
Michael Niedermayer [Tue, 25 Sep 2012 15:45:51 +0000 (17:45 +0200)]
dnxhdenc: remove redundant call to ff_dsputil_init()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec_alloc_frame: dont zero the whole struct twice
Michael Niedermayer [Tue, 25 Sep 2012 15:36:17 +0000 (17:36 +0200)]
avcodec_alloc_frame: dont zero the whole struct twice

cleaning it up is already done in avcodec_get_frame_defaults()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agooggparsetheora: print error when failing on unknown header
Michael Niedermayer [Tue, 25 Sep 2012 15:32:11 +0000 (17:32 +0200)]
oggparsetheora: print error when failing on unknown header

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 25 Sep 2012 14:11:34 +0000 (16:11 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  pthread: make sure AVFrame.extended_data is set properly.
  libfdk-aac: reindent after last commit
  libfdk-aac: Limit to supported sample rates.
  cbrt_tablegen: Include libm.h
  oggparsetheora: make it more robust
  ogg: prevent NULL pointer deference in theora gptopts

Conflicts:
libavformat/oggparsetheora.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agooggdec: add missing () for OGG_NOGRANULE_VALUE
Michael Niedermayer [Tue, 25 Sep 2012 14:03:55 +0000 (16:03 +0200)]
oggdec: add missing () for OGG_NOGRANULE_VALUE

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd1f05dd18375f2f8e68372edee11436927e43ba8'
Michael Niedermayer [Tue, 25 Sep 2012 14:00:09 +0000 (16:00 +0200)]
Merge commit 'd1f05dd18375f2f8e68372edee11436927e43ba8'

* commit 'd1f05dd18375f2f8e68372edee11436927e43ba8':
  ogg: calculate the start position once all the headers are parsed

Conflicts:
libavformat/oggdec.c
libavformat/oggparseskeleton.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agooggdec: print a warning if the number of headers mismatch expectations.
Michael Niedermayer [Tue, 25 Sep 2012 13:34:58 +0000 (15:34 +0200)]
oggdec: print a warning if the number of headers mismatch expectations.

This is based on:
commit 7751e4693dd10ec98c20fbd9887233b575034272
Author: Luca Barbato <lu_zero@gentoo.org>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agooggdec: print error when headers couldnt be parses successfully
Michael Niedermayer [Tue, 25 Sep 2012 13:22:05 +0000 (15:22 +0200)]
oggdec: print error when headers couldnt be parses successfully

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7751e4693dd10ec98c20fbd9887233b575034272'
Michael Niedermayer [Tue, 25 Sep 2012 11:34:06 +0000 (13:34 +0200)]
Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'

* commit '7751e4693dd10ec98c20fbd9887233b575034272':
  ogg: check that the expected number of headers had been parsed
  libx264: change default to closed gop to match x264cli
  Use avcodec_free_frame() to free AVFrames.
  lavf: use a malloced AVFrame in try_decode_frame().
  lavc: add avcodec_free_frame().
  lavc: ensure extended_data is set properly on decoding
  lavc: initialize AVFrame.extended_data in avcodec_get_frame_defaults()
  lavc: use av_mallocz to allocate AVFrames.
  lavc: rename the argument of avcodec_alloc_frame/get_frame_defaults

Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
libavcodec/utils.c
libavcodec/version.h
libavfilter/src_movie.c
libavformat/oggdec.c
libavformat/oggdec.h
libavformat/oggparsetheora.c
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopthread: make sure AVFrame.extended_data is set properly.
Anton Khirnov [Tue, 25 Sep 2012 06:08:28 +0000 (08:08 +0200)]
pthread: make sure AVFrame.extended_data is set properly.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoffprobe: drop pointless opaque parameter in writer init callback
Stefano Sabatini [Mon, 24 Sep 2012 14:42:09 +0000 (16:42 +0200)]
ffprobe: drop pointless opaque parameter in writer init callback

The parameter was never used.

6 years agoffprobe: reindent after previous commit
Stefano Sabatini [Mon, 24 Sep 2012 16:21:21 +0000 (18:21 +0200)]
ffprobe: reindent after previous commit

6 years agoffprobe: rework checking logic in writer_print_time() and writer_print_rational()
Stefano Sabatini [Mon, 24 Sep 2012 16:18:56 +0000 (18:18 +0200)]
ffprobe: rework checking logic in writer_print_time() and writer_print_rational()

Make writer_print_time() and writer_print_rational() always call
writer_print_int() or writer_print_string(). This way the checks for
determining if the value should be printed or not are consistently
performed in the low level functions.

writer_print_rational() is moved downward in order to avoid a forward
reference.

Simplify/amend the overall logic.

6 years agoFix two "skiping" typo.
Clément Bœsch [Tue, 25 Sep 2012 05:42:32 +0000 (07:42 +0200)]
Fix two "skiping" typo.

6 years agolibfdk-aac: reindent after last commit
Nathan Caldwell [Mon, 24 Sep 2012 23:03:22 +0000 (17:03 -0600)]
libfdk-aac: reindent after last commit

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolibfdk-aac: Limit to supported sample rates.
Nathan Caldwell [Mon, 24 Sep 2012 23:02:44 +0000 (17:02 -0600)]
libfdk-aac: Limit to supported sample rates.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agocbrt_tablegen: Include libm.h
Derek Buitenhuis [Mon, 24 Sep 2012 23:22:15 +0000 (23:22 +0000)]
cbrt_tablegen: Include libm.h

Needed for cbrtf fallback on systems which lack it.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoffv1dec: change bitstream end check to a exact check instead of a +-1 check
Michael Niedermayer [Mon, 24 Sep 2012 02:58:24 +0000 (04:58 +0200)]
ffv1dec: change bitstream end check to a exact check instead of a +-1 check

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