ffmpeg.git
8 years agoRELEASE: bump to current version (0.10.2).
Clément Bœsch [Mon, 26 Mar 2012 20:46:03 +0000 (22:46 +0200)]
RELEASE: bump to current version (0.10.2).

8 years agoAPIchanges: fill in missing dates and hashes.
Clément Bœsch [Mon, 26 Mar 2012 20:43:10 +0000 (22:43 +0200)]
APIchanges: fill in missing dates and hashes.

8 years agoaac: reference supported sample rates in encoders.
Clément Bœsch [Mon, 26 Mar 2012 20:32:17 +0000 (22:32 +0200)]
aac: reference supported sample rates in encoders.

8 years agoffmpeg: more expressive sample rate automatic selection.
Clément Bœsch [Tue, 20 Mar 2012 15:19:49 +0000 (16:19 +0100)]
ffmpeg: more expressive sample rate automatic selection.

Output now lists the available sample rates with commands like
ffmpeg -f lavfi -i aevalsrc=0 -ar 20000 -y /tmp/out.mp3

8 years agolavfi: add avfilter_fill_frame_from_{audio_,}buffer_ref().
Clément Bœsch [Tue, 14 Feb 2012 16:00:53 +0000 (17:00 +0100)]
lavfi: add avfilter_fill_frame_from_{audio_,}buffer_ref().

8 years agoindeo3dec: check mv bitstream pointer
Michael Niedermayer [Mon, 26 Mar 2012 20:11:53 +0000 (22:11 +0200)]
indeo3dec: check mv bitstream pointer

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoindeo3dec: Fix end pointer.
Michael Niedermayer [Mon, 26 Mar 2012 20:06:54 +0000 (22:06 +0200)]
indeo3dec: Fix end pointer.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 26 Mar 2012 18:34:29 +0000 (20:34 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  build: ppc: drop stray leftover backslash
  build: Only clean the architecture subdirectory we build for.
  build: drop some unnecessary dependencies from the H.264 parser
  build: prettyprinting cosmetics
  libavutil: Remove pointless rational test program.
  libavutil: Remove broken and pointless lzo test program.
  lavf doxy: expand AVStream.codec doxy.
  lavf doxy: improve AVStream.time_base doxy.
  lavf doxy: add some basic documentation about reading from the demuxer.
  lavf doxy: document passing options to demuxers.
  lavf doxy: clarify that an AVPacket contains encoded data.
  mpegtsenc: allow user triggered PES packet flushing
  APIchanges: mark the place where 0.7 was cut.
  APIchanges: mark the place where 0.8 was cut.
  APIchanges: fill in missing dates and hashes.
  smacker: convert palette and header reading to bytestream2.
  alac: convert extradata reading to bytestream2.

Conflicts:
doc/APIchanges
libavcodec/smacker.c
libavcodec/x86/Makefile
libavfilter/Makefile
libavutil/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoEnable generic index/seeking for mgsts demuxer.
Reimar Döffinger [Sun, 25 Mar 2012 11:25:42 +0000 (13:25 +0200)]
Enable generic index/seeking for mgsts demuxer.

This depends on the proposed parser change for 0-size packets
in previous mail, otherwise video now plays far too fast.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoHandle 0-size sync packets when only parsing headers.
Reimar Döffinger [Sun, 25 Mar 2012 11:16:48 +0000 (13:16 +0200)]
Handle 0-size sync packets when only parsing headers.

Currently, the duration of those packets is just discarded
when enabling parsing, thus the output of the Metal Gear Solid
demuxer breaks completely when just setting AVSTREAM_PARSE_HEADERS.
The result will not be correct if a parser creates a delay even
with PARSER_FLAG_COMPLETE_FRAMES and there might be other cases
where it does not work correct, but just discarding them as it
is done currently seems worse.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoSupport FLIC in MOV.
Reimar Döffinger [Sat, 24 Mar 2012 19:28:43 +0000 (20:28 +0100)]
Support FLIC in MOV.

Fixes trac issue #626.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agobuild: ppc: drop stray leftover backslash
Diego Biurrun [Mon, 26 Mar 2012 14:15:52 +0000 (16:15 +0200)]
build: ppc: drop stray leftover backslash

8 years agoals: consistent messages
Thilo Borgmann [Mon, 26 Mar 2012 13:24:45 +0000 (15:24 +0200)]
als: consistent messages

"." for warnings, "!" for errors.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibopenjpegenc: remove leftover because older version of patch being applied
Paul B Mahol [Mon, 26 Mar 2012 13:01:56 +0000 (13:01 +0000)]
libopenjpegenc: remove leftover because older version of patch being applied

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoALS error message pretty print
Thilo Borgmann [Mon, 26 Mar 2012 13:25:27 +0000 (15:25 +0200)]
ALS error message pretty print

One prettier message.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoqdm2: Fix out of array writes
Michael Niedermayer [Mon, 26 Mar 2012 13:29:14 +0000 (15:29 +0200)]
qdm2: Fix out of array writes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoqdm2: fix out of array read
Michael Niedermayer [Mon, 26 Mar 2012 13:26:14 +0000 (15:26 +0200)]
qdm2: fix out of array read

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoqdm2dec: fix out of array read
Michael Niedermayer [Mon, 26 Mar 2012 13:16:47 +0000 (15:16 +0200)]
qdm2dec: fix out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomxfdec: fix off by one error.
Michael Niedermayer [Mon, 26 Mar 2012 13:05:02 +0000 (15:05 +0200)]
mxfdec: fix off by one error.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agobuild: Only clean the architecture subdirectory we build for.
Diego Biurrun [Mon, 6 Feb 2012 18:31:18 +0000 (19:31 +0100)]
build: Only clean the architecture subdirectory we build for.

This allows simplifying the Makefiles; it is no longer necessary to register
arch subdirectory Makefiles, just putting them in place is enough.

8 years agobuild: drop some unnecessary dependencies from the H.264 parser
Diego Biurrun [Sun, 25 Mar 2012 10:19:55 +0000 (12:19 +0200)]
build: drop some unnecessary dependencies from the H.264 parser

8 years agobuild: prettyprinting cosmetics
Diego Biurrun [Thu, 2 Feb 2012 22:55:57 +0000 (23:55 +0100)]
build: prettyprinting cosmetics

8 years agolibavutil: Remove pointless rational test program.
Diego Biurrun [Thu, 26 Jan 2012 17:45:11 +0000 (18:45 +0100)]
libavutil: Remove pointless rational test program.

8 years agolibavutil: Remove broken and pointless lzo test program.
Diego Biurrun [Thu, 26 Jan 2012 01:38:30 +0000 (02:38 +0100)]
libavutil: Remove broken and pointless lzo test program.

8 years agolavf doxy: expand AVStream.codec doxy.
Anton Khirnov [Thu, 15 Mar 2012 10:27:47 +0000 (11:27 +0100)]
lavf doxy: expand AVStream.codec doxy.

8 years agolavf doxy: improve AVStream.time_base doxy.
Anton Khirnov [Mon, 27 Feb 2012 08:41:31 +0000 (09:41 +0100)]
lavf doxy: improve AVStream.time_base doxy.

Remove confusing sentence that implied the user should set the timebase.
Elaborate on how the timebase is set for muxing.

8 years agolavf doxy: add some basic documentation about reading from the demuxer.
Anton Khirnov [Mon, 27 Feb 2012 08:35:17 +0000 (09:35 +0100)]
lavf doxy: add some basic documentation about reading from the demuxer.

8 years agolavf doxy: document passing options to demuxers.
Anton Khirnov [Tue, 3 Jan 2012 07:34:55 +0000 (08:34 +0100)]
lavf doxy: document passing options to demuxers.

8 years agolavf doxy: clarify that an AVPacket contains encoded data.
Anton Khirnov [Tue, 3 Jan 2012 06:41:14 +0000 (07:41 +0100)]
lavf doxy: clarify that an AVPacket contains encoded data.

8 years agompegtsenc: allow user triggered PES packet flushing
Jindrich Makovicka [Wed, 21 Mar 2012 11:35:15 +0000 (12:35 +0100)]
mpegtsenc: allow user triggered PES packet flushing

Signed-off-by: Jindrich Makovicka <jindrich.makovicka@nangu.tv>
Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoAPIchanges: mark the place where 0.7 was cut.
Anton Khirnov [Tue, 20 Mar 2012 06:58:00 +0000 (07:58 +0100)]
APIchanges: mark the place where 0.7 was cut.

8 years agoAPIchanges: mark the place where 0.8 was cut.
Anton Khirnov [Tue, 20 Mar 2012 06:58:00 +0000 (07:58 +0100)]
APIchanges: mark the place where 0.8 was cut.

8 years agoAPIchanges: fill in missing dates and hashes.
Anton Khirnov [Tue, 20 Mar 2012 06:45:45 +0000 (07:45 +0100)]
APIchanges: fill in missing dates and hashes.

8 years agolibopenjpegdec: refactor some code and fix memory leaks
Paul B Mahol [Mon, 26 Mar 2012 02:22:34 +0000 (02:22 +0000)]
libopenjpegdec: refactor some code and fix memory leaks

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibopenjpegdec: always check image because decoding may still fail
Paul B Mahol [Mon, 26 Mar 2012 02:01:23 +0000 (02:01 +0000)]
libopenjpegdec: always check image because decoding may still fail

Fixes bunch of segfaults.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibopenjpegenc: allow changing encoding parameters
Paul B Mahol [Sun, 25 Mar 2012 23:33:53 +0000 (23:33 +0000)]
libopenjpegenc: allow changing encoding parameters

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibopenjpegenc: merge common code
Paul B Mahol [Sun, 25 Mar 2012 23:33:52 +0000 (23:33 +0000)]
libopenjpegenc: merge common code

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibopenjpegenc: use pix_fmt descriptor to get bpp
Paul B Mahol [Sun, 25 Mar 2012 23:33:51 +0000 (23:33 +0000)]
libopenjpegenc: use pix_fmt descriptor to get bpp

This will also simplify adding support for RGB565 and similar.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibopenjpegenc: use pix_fmt descriptor to get numcomps
Paul B Mahol [Sun, 25 Mar 2012 23:33:50 +0000 (23:33 +0000)]
libopenjpegenc: use pix_fmt descriptor to get numcomps

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoindeo4: better mv check
Michael Niedermayer [Mon, 26 Mar 2012 01:46:06 +0000 (03:46 +0200)]
indeo4: better mv check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoindeo5: check motion vectors.
Michael Niedermayer [Mon, 26 Mar 2012 00:24:36 +0000 (02:24 +0200)]
indeo5: check motion vectors.

fixes out of frame reading

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomxfdec: pass correct context to av_timecode_init()
Michael Niedermayer [Mon, 26 Mar 2012 01:03:02 +0000 (03:03 +0200)]
mxfdec: pass correct context to av_timecode_init()

fixes null ptr dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosmacker: convert palette and header reading to bytestream2.
Ronald S. Bultje [Sun, 25 Mar 2012 00:37:43 +0000 (17:37 -0700)]
smacker: convert palette and header reading to bytestream2.

8 years agovf_hflip: accept PIX_FMT_RGB444 and PIX_FMT_BGR444 pixel formats
Paul B Mahol [Sun, 25 Mar 2012 21:18:19 +0000 (21:18 +0000)]
vf_hflip: accept PIX_FMT_RGB444 and PIX_FMT_BGR444 pixel formats

Signed-off-by: Paul B Mahol <onemda@gmail.com>
added fate checksum update
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopng: fix warning about discarding qualifiers [-Wincompatible-pointer-types]
Paul B Mahol [Sun, 25 Mar 2012 10:55:49 +0000 (10:55 +0000)]
png: fix warning about discarding qualifiers [-Wincompatible-pointer-types]

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopthread : Remove lock/unlock pairs in worker loop to avoid unexpected state changes.
Aaron Colwell [Thu, 22 Mar 2012 19:37:47 +0000 (12:37 -0700)]
pthread : Remove lock/unlock pairs in worker loop to avoid unexpected state changes.

Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 25 Mar 2012 21:10:30 +0000 (23:10 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: dsputil: prettyprint gcc inline asm
  x86: K&R prettyprinting cosmetics for dsputil_mmx.c
  x86: conditionally compile H.264 QPEL optimizations
  dsputil_mmx: Surround QPEL macros by "do { } while (0);" blocks.
  Ignore generated files below doc/.
  dpcm: convert to bytestream2.
  interplayvideo: convert to bytestream2.
  movenc: Merge if statements
  h264: fix memleak in error path.
  pthread: Immediately release all frames in ff_thread_flush()
  h264: Add check for invalid chroma_format_idc
  utvideo: port header reading to bytestream2.

Conflicts:
.gitignore
configure
libavcodec/h264_ps.c
libavcodec/interplayvideo.c
libavcodec/pthread.c
libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoalac: convert extradata reading to bytestream2.
Ronald S. Bultje [Sun, 25 Mar 2012 02:10:40 +0000 (19:10 -0700)]
alac: convert extradata reading to bytestream2.

8 years agoswr-test: test the new flexible buffering
Michael Niedermayer [Sun, 25 Mar 2012 19:50:49 +0000 (21:50 +0200)]
swr-test: test the new flexible buffering

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr: realloc_audio: support packed audio buffers
Michael Niedermayer [Sun, 25 Mar 2012 19:50:00 +0000 (21:50 +0200)]
swr: realloc_audio: support packed audio buffers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr: More flexible and convenient buffering
Michael Niedermayer [Sun, 25 Mar 2012 19:04:48 +0000 (21:04 +0200)]
swr: More flexible and convenient buffering

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix SVCD scan_offset option
Julien Ramseier [Sun, 25 Mar 2012 14:38:57 +0000 (16:38 +0200)]
Fix SVCD scan_offset option

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years ago"Metal Gear Solid: The Twin Snakes" demuxer
Paul B Mahol [Wed, 21 Mar 2012 22:18:54 +0000 (22:18 +0000)]
"Metal Gear Solid: The Twin Snakes" demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoCrystalHD: Remove EXPERIMENTAL flag for known good formats.
Philip Langdale [Sat, 24 Mar 2012 21:14:51 +0000 (14:14 -0700)]
CrystalHD: Remove EXPERIMENTAL flag for known good formats.

With the flag in place, it's hard to actually use the decoder, and
I'm happy with how it works, with the exception of DivX3 where I've
never found a sample that worked that I was confident actually
matched what the hardware claimed to support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopthread: return proper error code on pthread_create failure
Marton Balint [Sat, 24 Mar 2012 22:34:43 +0000 (23:34 +0100)]
pthread: return proper error code on pthread_create failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr: fix segfault when 0 out size is used.
Michael Niedermayer [Sun, 25 Mar 2012 09:48:09 +0000 (11:48 +0200)]
swr: fix segfault when 0 out size is used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr: revert stray hunk
Michael Niedermayer [Sun, 25 Mar 2012 08:59:22 +0000 (10:59 +0200)]
swr: revert stray hunk

Found-by:ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoVC1: Do not needlessly use signed types.
Reimar Döffinger [Fri, 23 Mar 2012 20:21:47 +0000 (21:21 +0100)]
VC1: Do not needlessly use signed types.

This might even have prevented the compiler from some optimizations,
since both signed and unsigned types are used for the dezigzag tables/
table pointers, and if a branches uses both the compiler needs to
create more complex code.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoDV: detect another case of broken DV files.
Reimar Döffinger [Sat, 24 Mar 2012 16:13:55 +0000 (17:13 +0100)]
DV: detect another case of broken DV files.

See trac issue #217.
Only the dsf field seems to be used to distinguish between PAL and NTSC.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoDV: check coded_width/height instead of width/height.
Reimar Döffinger [Sat, 24 Mar 2012 22:39:30 +0000 (23:39 +0100)]
DV: check coded_width/height instead of width/height.

This makes the workaround also work with lowres.
Fixes issue #633.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agovqavideo: fix decoding of samples with no partial updates.
Reimar Döffinger [Sat, 24 Mar 2012 22:01:37 +0000 (23:01 +0100)]
vqavideo: fix decoding of samples with no partial updates.

Fixes playback of
http://samples.mplayerhq.hu/game-formats/vqa/landsoflore/B0EB8711.VQA
(trac issue #710).

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agox86: dsputil: prettyprint gcc inline asm
Diego Biurrun [Fri, 16 Mar 2012 17:42:01 +0000 (18:42 +0100)]
x86: dsputil: prettyprint gcc inline asm

8 years agox86: K&R prettyprinting cosmetics for dsputil_mmx.c
Diego Biurrun [Tue, 6 Mar 2012 12:00:42 +0000 (13:00 +0100)]
x86: K&R prettyprinting cosmetics for dsputil_mmx.c

8 years agox86: conditionally compile H.264 QPEL optimizations
Diego Biurrun [Sun, 18 Dec 2011 13:10:33 +0000 (14:10 +0100)]
x86: conditionally compile H.264 QPEL optimizations

8 years agodsputil_mmx: Surround QPEL macros by "do { } while (0);" blocks.
Diego Biurrun [Thu, 8 Mar 2012 23:59:06 +0000 (00:59 +0100)]
dsputil_mmx: Surround QPEL macros by "do { } while (0);" blocks.

This makes them safe to use in non-fully braced if-blocks and similar.

8 years agoIgnore generated files below doc/.
Diego Biurrun [Fri, 23 Mar 2012 11:20:54 +0000 (12:20 +0100)]
Ignore generated files below doc/.

8 years agoresample: Fix boundary handling with fragments.
Michael Niedermayer [Sun, 25 Mar 2012 08:34:06 +0000 (10:34 +0200)]
resample: Fix boundary handling with fragments.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr: Fix partial flushing.
Michael Niedermayer [Sun, 25 Mar 2012 03:58:31 +0000 (05:58 +0200)]
swr: Fix partial flushing.

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr: test partial flushing
Michael Niedermayer [Sun, 25 Mar 2012 03:37:26 +0000 (05:37 +0200)]
swr: test partial flushing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomov: fix heap buffer overflow
Michael Niedermayer [Sun, 25 Mar 2012 02:15:51 +0000 (04:15 +0200)]
mov: fix heap buffer overflow

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodpcm: convert to bytestream2.
Ronald S. Bultje [Mon, 19 Mar 2012 02:33:04 +0000 (19:33 -0700)]
dpcm: convert to bytestream2.

8 years agoswr: allow flushing in multiple steps if the output is too small.
Michael Niedermayer [Sun, 25 Mar 2012 01:33:06 +0000 (03:33 +0200)]
swr: allow flushing in multiple steps if the output is too small.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 25 Mar 2012 00:56:53 +0000 (01:56 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avc: Add a function for converting mp4 style extradata to annex b
  pthread: free progress if buffer allocation failed.
  lavc/avconv: support changing frame sizes in codecs with frame mt.
  libavformat: Document who sets the AVStream.id field
  utvideo: mark output picture as keyframe.
  sunrast: Add support for negative linesize.
  vp8: fix update_lf_deltas in libavcodec/vp8.c
  ralf: read Huffman code lengths without GetBitContext

Conflicts:
ffmpeg.c
libavcodec/sunrastenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agointerplayvideo: convert to bytestream2.
Ronald S. Bultje [Sun, 25 Mar 2012 00:05:05 +0000 (17:05 -0700)]
interplayvideo: convert to bytestream2.

8 years agoffmpeg: drop struct from SwrContext.
Michael Niedermayer [Sun, 25 Mar 2012 00:00:07 +0000 (01:00 +0100)]
ffmpeg: drop struct from SwrContext.

Its a typdef now and doesnt need the struct anymore.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr: fix compilation failure with old versions of gcc.
Michael Niedermayer [Sat, 24 Mar 2012 23:35:10 +0000 (00:35 +0100)]
swr: fix compilation failure with old versions of gcc.

gcc 4.4 did not like the way i used typedefs

Idea-by: beastd
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomovenc: Merge if statements
Martin Storsjö [Thu, 22 Mar 2012 11:31:31 +0000 (13:31 +0200)]
movenc: Merge if statements

This isn't exactly equivalent with the earlier code for codecs
other than H264 and VC1, but those are two only codecs supported
by this codepath anyway, and it simplifies it a bit.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agolibaacplus: switch to encode2()
Paul B Mahol [Sat, 24 Mar 2012 17:41:55 +0000 (17:41 +0000)]
libaacplus: switch to encode2()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoh264: fix memleak in error path.
Alexander Strange [Sat, 24 Mar 2012 22:34:22 +0000 (15:34 -0700)]
h264: fix memleak in error path.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agopthread: Immediately release all frames in ff_thread_flush()
Alexander Strange [Sat, 24 Mar 2012 22:25:15 +0000 (18:25 -0400)]
pthread: Immediately release all frames in ff_thread_flush()

Before this, they were only added to the delayed release queue and not
freed until later. This could lead to unnecessary memory use or buffer
exhaustion.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoh264: Add check for invalid chroma_format_idc
Alexander Strange [Sat, 24 Mar 2012 21:32:14 +0000 (17:32 -0400)]
h264: Add check for invalid chroma_format_idc

Fixes a crash when FF_DEBUG_PICT_INFO is used.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoswr: drop SWR_CH_MAX with the next major ABI bump
Michael Niedermayer [Sat, 24 Mar 2012 22:20:46 +0000 (23:20 +0100)]
swr: drop SWR_CH_MAX with the next major ABI bump

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoutvideo: port header reading to bytestream2.
Ronald S. Bultje [Fri, 23 Mar 2012 00:25:22 +0000 (17:25 -0700)]
utvideo: port header reading to bytestream2.

Fixes crash during slice size reading if slice_end goes negative.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
8 years agoswr: dont use SWR_CH_MAX in the public function declaration.
Michael Niedermayer [Sat, 24 Mar 2012 22:00:59 +0000 (23:00 +0100)]
swr: dont use SWR_CH_MAX in the public function declaration.

This change should make no binary difference to the generated code.
the API version is just bumped for correctness sake, this is not
really a API or ABI change.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr: make SwrContext a typedef.
Michael Niedermayer [Sat, 24 Mar 2012 21:56:24 +0000 (22:56 +0100)]
swr: make SwrContext a typedef.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswresample: support up to 32 channels
Michael Niedermayer [Sat, 24 Mar 2012 21:38:14 +0000 (22:38 +0100)]
swresample: support up to 32 channels

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavc: Add a function for converting mp4 style extradata to annex b
Martin Storsjö [Thu, 22 Mar 2012 11:25:58 +0000 (13:25 +0200)]
avc: Add a function for converting mp4 style extradata to annex b

Make movenc use this function instead of the current custom
conversion function.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agopthread: free progress if buffer allocation failed.
Ronald S. Bultje [Sat, 24 Mar 2012 19:19:19 +0000 (20:19 +0100)]
pthread: free progress if buffer allocation failed.

Else we run out of progress variables after a few failed buffer
allocations.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agolavc/avconv: support changing frame sizes in codecs with frame mt.
Ronald S. Bultje [Fri, 23 Mar 2012 22:03:03 +0000 (15:03 -0700)]
lavc/avconv: support changing frame sizes in codecs with frame mt.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agolibavformat: Document who sets the AVStream.id field
Martin Storsjö [Thu, 22 Mar 2012 15:05:08 +0000 (17:05 +0200)]
libavformat: Document who sets the AVStream.id field

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoutvideo: mark output picture as keyframe.
Kostya Shishkov [Sat, 24 Mar 2012 18:54:31 +0000 (19:54 +0100)]
utvideo: mark output picture as keyframe.

Spotted by Антон.

8 years agoadxenc: fix error in merging from qatar
Paul B Mahol [Sat, 24 Mar 2012 15:28:51 +0000 (15:28 +0000)]
adxenc: fix error in merging from qatar

Pointed out by FATE.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosonic: mark as experimental
Paul B Mahol [Sat, 24 Mar 2012 16:08:57 +0000 (16:08 +0000)]
sonic: mark as experimental

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoindeo5dec: Make sure we have had a valid gop header.
Michael Niedermayer [Sat, 24 Mar 2012 16:43:55 +0000 (17:43 +0100)]
indeo5dec: Make sure we have had a valid gop header.

This prevents decoding happening on a half initialized context.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agotruemotion2dec: Fix overread of input.
Michael Niedermayer [Sat, 24 Mar 2012 16:42:14 +0000 (17:42 +0100)]
truemotion2dec: Fix overread of input.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agocavsdec: check stc in decode_slice_header()
Michael Niedermayer [Sat, 24 Mar 2012 15:29:46 +0000 (16:29 +0100)]
cavsdec: check stc in decode_slice_header()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosunrast: Add support for negative linesize.
Aneesh Dogra [Fri, 23 Mar 2012 17:54:00 +0000 (23:24 +0530)]
sunrast: Add support for negative linesize.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agoh264: move resolution change check further up.
Michael Niedermayer [Sat, 24 Mar 2012 15:23:40 +0000 (16:23 +0100)]
h264: move resolution change check further up.

This prevents some variables from being changed in case of a
rejected resolution change.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovp8: fix update_lf_deltas in libavcodec/vp8.c
Janne Salonen [Mon, 19 Mar 2012 07:35:09 +0000 (09:35 +0200)]
vp8: fix update_lf_deltas in libavcodec/vp8.c

lf_delta.ref[i] and lf_delta.mode[i] were incorrectly reset to 0 if
specific delta value was not updated. Fixed to keep the previous value
if flag indicates that element in question is not updated.

Signed-off-by: Janne Salonen <jsalonen@google.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoalsdec: check opt_order.
Michael Niedermayer [Sat, 24 Mar 2012 00:39:13 +0000 (01:39 +0100)]
alsdec: check opt_order.

Fixes out of array write in quant_cof

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>