OSDN Git Service

android-x86/external-ffmpeg.git
12 years agooma: dont over-read buffer
Michael Niedermayer [Tue, 27 Mar 2012 10:52:53 +0000 (12:52 +0200)]
oma: dont over-read buffer

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 27 Mar 2012 09:52:08 +0000 (11:52 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  make av_interleaved_write_frame() flush packets when pkt is NULL
  mpegts: Fix dead error checks
  vc1: Do not read from array if index is invalid.
  targa: convert to bytestream2.
  rv34: set mb_num_left to 0 after finishing a frame

Conflicts:
libavcodec/targa.c
libavcodec/vc1data.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years agomake av_interleaved_write_frame() flush packets when pkt is NULL
Jindrich Makovicka [Wed, 21 Mar 2012 10:42:32 +0000 (11:42 +0100)]
make av_interleaved_write_frame() flush packets when pkt is NULL

This patch allows the user to force flushing of all queued packets
by calling av_interleaved_write_frame() with pkt set to NULL.

Signed-off-by: Jindrich Makovicka <jindrich.makovicka@nangu.tv>
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years agodoc: clarify dshow input requirements
Compn [Tue, 27 Mar 2012 02:18:48 +0000 (22:18 -0400)]
doc: clarify dshow input requirements

12 years agoj2kdec: remove pointless swapping
Paul B Mahol [Tue, 27 Mar 2012 01:15:20 +0000 (01:15 +0000)]
j2kdec: remove pointless swapping

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoj2kdec: vertically align AVCodec members
Paul B Mahol [Mon, 26 Mar 2012 23:32:30 +0000 (23:32 +0000)]
j2kdec: vertically align AVCodec members

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoj2kdec: Remove useless .pix_fmts.
Paul B Mahol [Mon, 26 Mar 2012 23:32:30 +0000 (23:32 +0000)]
j2kdec: Remove useless .pix_fmts.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoj2kdec: convert to bytestream2 API
Paul B Mahol [Mon, 26 Mar 2012 23:32:29 +0000 (23:32 +0000)]
j2kdec: convert to bytestream2 API

Protects against overreads.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agompegts: Fix dead error checks
Alex Converse [Mon, 26 Mar 2012 22:51:59 +0000 (15:51 -0700)]
mpegts: Fix dead error checks

12 years agovc1: Do not read from array if index is invalid.
Mashiat Sarker Shakkhar [Sat, 24 Mar 2012 22:49:34 +0000 (15:49 -0700)]
vc1: Do not read from array if index is invalid.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
12 years agotarga: convert to bytestream2.
Ronald S. Bultje [Tue, 27 Mar 2012 00:46:16 +0000 (17:46 -0700)]
targa: convert to bytestream2.

Also remove some write-only variables or write-only variable
assignments, remove internal colorspace conversion to native
endianness (that can be done by swscale much more efficiently),
and some cosmetics.

12 years agoffmpeg: fix handling or empty audio packets
Michael Niedermayer [Tue, 27 Mar 2012 00:43:40 +0000 (02:43 +0200)]
ffmpeg: fix handling or empty audio packets

Fixes Ticket1131

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoffmpeg: more verbose error messages in case of audio encoding failure.
Michael Niedermayer [Tue, 27 Mar 2012 00:30:08 +0000 (02:30 +0200)]
ffmpeg: more verbose error messages in case of audio encoding failure.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agoRevert "raw: move buffer size check up."
Michael Niedermayer [Tue, 27 Mar 2012 00:11:03 +0000 (02:11 +0200)]
Revert "raw: move buffer size check up."

This reverts commit cc5dd632cecc5114717d0b90f8c2be162b1c6ee8.
The change was redundant, it has been fixed long ago (422e3a7)

Conflicts:

libavcodec/rawdec.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agorv34: set mb_num_left to 0 after finishing a frame
Ronald S. Bultje [Mon, 26 Mar 2012 22:20:02 +0000 (00:20 +0200)]
rv34: set mb_num_left to 0 after finishing a frame

Prevents running error resilience on a previous frame which will write
to the pic->mb_type[] array of the previous image. The array might
already be re-used for a new image in a subsequent thread, thus cause
two threads to write to the same pic->mb_type[] array, causing a race
condition which can crash in rv34_decode_cbp(), called by
rv34_decode_inter_mb_header() (which accesses mb_type[] twice,
assuming values are maintained, which the race condition breaks).

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
12 years agoj2kenc: cosmetics: vertically align AVCodec members.
Paul B Mahol [Mon, 26 Mar 2012 20:19:01 +0000 (20:19 +0000)]
j2kenc: cosmetics: vertically align AVCodec members.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agolibopenjpegdec: hack to fix GRAY16 decoding
Paul B Mahol [Sun, 25 Mar 2012 23:31:31 +0000 (23:31 +0000)]
libopenjpegdec: hack to fix GRAY16 decoding

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agovc1dec: move mquant zero check down.
Michael Niedermayer [Mon, 26 Mar 2012 22:44:32 +0000 (00:44 +0200)]
vc1dec: move mquant zero check down.

This way it catches all cases, and prevents later segfaults.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years agotarga: Fix input buffer size check.
Michael Niedermayer [Mon, 26 Mar 2012 22:12:03 +0000 (00:12 +0200)]
targa: Fix input buffer size check.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 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).

12 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.

12 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.

12 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

12 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().

12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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

12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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.

12 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

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

12 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.

12 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.

12 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.

12 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.

12 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.

12 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.

12 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.

12 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>
12 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.

12 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.

12 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.

12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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.

12 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>
12 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>
12 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>
12 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>
12 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.

12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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

12 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

12 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

12 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.

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

12 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>
12 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>
12 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>
12 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>
12 years agodpcm: convert to bytestream2.
Ronald S. Bultje [Mon, 19 Mar 2012 02:33:04 +0000 (19:33 -0700)]
dpcm: convert to bytestream2.

12 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>
12 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>
12 years agointerplayvideo: convert to bytestream2.
Ronald S. Bultje [Sun, 25 Mar 2012 00:05:05 +0000 (17:05 -0700)]
interplayvideo: convert to bytestream2.

12 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>
12 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>
12 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>
12 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>
12 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>
12 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>
12 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>