ffmpeg.git
8 years agompeg4videodec: rewrite the slice end detection of non partitioned packets.
Michael Niedermayer [Sat, 10 Sep 2011 00:21:22 +0000 (02:21 +0200)]
mpeg4videodec: rewrite the slice end detection of non partitioned packets.
This no longer needs thread syncronization thus speeding frame multithreading up.
Fixes Ticket28

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFixed size given to init_get_bits().
Laurent Aimar [Fri, 9 Sep 2011 21:46:00 +0000 (23:46 +0200)]
Fixed size given to init_get_bits().

init_get_bits() takes a number of bits and not a number of bytes as
its size argument.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agocljr: init_get_bits size in bits instead of bytes
Alex Converse [Fri, 9 Sep 2011 21:50:33 +0000 (14:50 -0700)]
cljr: init_get_bits size in bits instead of bytes

8 years agoindeo2: fail if input buffer too small
Alex Converse [Fri, 9 Sep 2011 20:26:49 +0000 (13:26 -0700)]
indeo2: fail if input buffer too small

8 years agoindeo2: init_get_bits size in bits instead of bytes
Alex Converse [Fri, 9 Sep 2011 20:24:19 +0000 (13:24 -0700)]
indeo2: init_get_bits size in bits instead of bytes

8 years agoffv1: Fixed size given to init_get_bits() in decoder.
Laurent Aimar [Fri, 9 Sep 2011 20:04:09 +0000 (22:04 +0200)]
ffv1: Fixed size given to init_get_bits() in decoder.

init_get_bits() takes a number of bits and not a number of bytes as
its size argument.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
8 years agoFixed size given to init_get_bits() in ffv1 decoder.
Laurent Aimar [Fri, 9 Sep 2011 20:04:09 +0000 (22:04 +0200)]
Fixed size given to init_get_bits() in ffv1 decoder.

init_get_bits() takes a number of bits and not a number of bytes as
its size argument.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 9 Sep 2011 20:00:50 +0000 (22:00 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wavpack: Check error codes rather than working around error conditions.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: fix -re
Michael Niedermayer [Fri, 9 Sep 2011 17:54:04 +0000 (19:54 +0200)]
ffmpeg: fix -re

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agorc: finetune convergence failure fix
Michael Niedermayer [Fri, 9 Sep 2011 16:50:00 +0000 (18:50 +0200)]
rc: finetune convergence failure fix

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agorc: fix convergence failure
Michael Niedermayer [Fri, 9 Sep 2011 16:06:51 +0000 (18:06 +0200)]
rc: fix convergence failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix documentation for "-debug" commandline argument
Panagiotis H.M. Issaris [Wed, 17 Aug 2011 10:20:32 +0000 (12:20 +0200)]
Fix documentation for "-debug" commandline argument
(cherry picked from commit 180e7829428e26413916f0cbc2ad85eeb1fb877e)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoav_interleave_packet_per_dts: switch noninterleaved flushing logic to max dts.
Wolfram Gloger [Fri, 9 Sep 2011 15:15:08 +0000 (17:15 +0200)]
av_interleave_packet_per_dts: switch noninterleaved flushing logic to max dts.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffprobe: replace specific ## GNU cpp extension with __VA_ARGS__.
Clément Bœsch [Fri, 9 Sep 2011 12:40:18 +0000 (14:40 +0200)]
ffprobe: replace specific ## GNU cpp extension with __VA_ARGS__.

8 years agoasfenc: fix assert failure on long ffserver runs
Chiranjeevi Melam [Fri, 9 Sep 2011 01:32:24 +0000 (03:32 +0200)]
asfenc: fix assert failure on long ffserver runs

8 years agoPrevent double free of side_data when AVFMT_FLAG_KEEP_SIDE_DATA flag is set
Gavin Kinsey [Thu, 8 Sep 2011 12:01:14 +0000 (13:01 +0100)]
Prevent double free of side_data when AVFMT_FLAG_KEEP_SIDE_DATA flag is set

8 years agoffprobe: replace simple string printing with the appropriate helper.
Clément Bœsch [Thu, 8 Sep 2011 21:02:34 +0000 (23:02 +0200)]
ffprobe: replace simple string printing with the appropriate helper.

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 8 Sep 2011 20:37:31 +0000 (22:37 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Employ FF_ARRAY_ELEMS instead of manually calculating array length.
  Fixed invalid access in wavpack decoder on corrupted bitstream.
  Fixed invalid writes in wavpack decoder on corrupted bitstreams.
  Fixed invalid access in wavpack decoder on corrupted extra bits sub-blocks.
  rtpdec_asf: Fix integer underflow that could allow remote code execution

Conflicts:
libavformat/rtpdec_asf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoqcelpdec: fix the return value of qcelp_decode_frame().
Chris Rankin [Wed, 7 Sep 2011 09:17:30 +0000 (10:17 +0100)]
qcelpdec: fix the return value of qcelp_decode_frame().

8 years agomp3dec: Dont spam the user on multiple mp3 frames.
Chris Rankin [Thu, 8 Sep 2011 19:04:26 +0000 (21:04 +0200)]
mp3dec: Dont spam the user on multiple mp3 frames.

8 years agoffmdec: set avio buffer to ffm->packet_size, avoid dirty reads
Yan Jing [Thu, 8 Sep 2011 18:23:13 +0000 (20:23 +0200)]
ffmdec: set avio buffer to ffm->packet_size, avoid dirty reads

8 years agoffmdec: fix seeking for non indexed files
Michael Niedermayer [Thu, 8 Sep 2011 18:36:19 +0000 (20:36 +0200)]
ffmdec: fix seeking for non indexed files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmdec: handle wrapped file in ffm_seek
Yan Jing [Thu, 8 Sep 2011 18:09:40 +0000 (20:09 +0200)]
ffmdec: handle wrapped file in ffm_seek

8 years agowavpack: Check error codes rather than working around error conditions.
Alex Converse [Thu, 8 Sep 2011 18:02:43 +0000 (11:02 -0700)]
wavpack: Check error codes rather than working around error conditions.

8 years agodoxygen: dont generate docs for avconv.c
Michael Niedermayer [Thu, 8 Sep 2011 15:53:53 +0000 (17:53 +0200)]
doxygen: dont generate docs for avconv.c
This is a workaround to avoid links in the ffmpeg.c documentation randomly pointing to
different code in avconv.c
This should be removed once doxygen is fixed and we upgraded
doxygen 1.7.3 is the latests i tested and that still has this issue.
Fixed Ticket421

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoEmploy FF_ARRAY_ELEMS instead of manually calculating array length.
Diego Biurrun [Thu, 8 Sep 2011 12:21:38 +0000 (14:21 +0200)]
Employ FF_ARRAY_ELEMS instead of manually calculating array length.

8 years agoFixed invalid access in wavpack decoder on corrupted bitstream.
Laurent Aimar [Wed, 7 Sep 2011 20:02:55 +0000 (22:02 +0200)]
Fixed invalid access in wavpack decoder on corrupted bitstream.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoFixed invalid writes in wavpack decoder on corrupted bitstreams.
Laurent Aimar [Wed, 7 Sep 2011 20:17:39 +0000 (22:17 +0200)]
Fixed invalid writes in wavpack decoder on corrupted bitstreams.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoFixed invalid access in wavpack decoder on corrupted extra bits sub-blocks.
Laurent Aimar [Wed, 7 Sep 2011 21:12:32 +0000 (23:12 +0200)]
Fixed invalid access in wavpack decoder on corrupted extra bits sub-blocks.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoAdd loas as an extension for LOAS/LATM.
Carl Eugen Hoyos [Thu, 8 Sep 2011 06:24:17 +0000 (08:24 +0200)]
Add loas as an extension for LOAS/LATM.

8 years agoSupport remuxing aac_latm.
Carl Eugen Hoyos [Thu, 8 Sep 2011 06:22:50 +0000 (08:22 +0200)]
Support remuxing aac_latm.

8 years agolibvpxenc: add 'crf' private option
James Zern [Thu, 8 Sep 2011 02:14:37 +0000 (19:14 -0700)]
libvpxenc: add 'crf' private option

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibvpxenc: add 'rc_lookahead' private option
James Zern [Thu, 8 Sep 2011 02:14:33 +0000 (19:14 -0700)]
libvpxenc: add 'rc_lookahead' private option

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibvpxenc: silence AVOption related warnings
James Zern [Thu, 8 Sep 2011 02:14:27 +0000 (19:14 -0700)]
libvpxenc: silence AVOption related warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavopt: Fix searching for constants
Michael Niedermayer [Thu, 8 Sep 2011 03:27:01 +0000 (05:27 +0200)]
avopt: Fix searching for constants
Fixes Ticket350

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agojpeglsdec: fix infinite loop
Michael Niedermayer [Thu, 8 Sep 2011 03:05:11 +0000 (05:05 +0200)]
jpeglsdec: fix infinite loop
Fixes Ticket331

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoWTV muxer (1_extract_wtv_common_code.patch)
zhentan feng [Tue, 23 Aug 2011 13:40:58 +0000 (21:40 +0800)]
WTV muxer (1_extract_wtv_common_code.patch)

8 years agoflvdec: Remove AVFMTCTX_NOHEADER if both flags and metadata claim 1 stream
Asad Mehmood [Wed, 7 Sep 2011 22:18:07 +0000 (23:18 +0100)]
flvdec: Remove AVFMTCTX_NOHEADER if both flags and metadata claim 1 stream

If there is only 1 stream in an flv avformat_find_stream_info will continually
read until probesize is reached. This should stop it reading if the metadata
also claims there to be 1 stream.

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 7 Sep 2011 20:32:59 +0000 (22:32 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Add LATM muxer
  v210enc: clip values according to specifications
  v210enc: switch to PIX_FMT_422P10
  v210dec: switch to PIX_FMT_422P10
  AVOptions: remove AVOption.offset <= 0 checks
  AVOptions: deprecate av_opt_set_defaults2
  AVOptions: move doxy for av_opt_set_defaults() from opt.c to opt.h
  libx264: fix setting some more parameters
  libx264: fix setting the H.264 level
  libx264: add 'direct-pred' private option
  libx264: add 'partitions' private option

Conflicts:
Changelog
libavcodec/Makefile
libavcodec/libx264.c
libavcodec/v210enc.c
libavfilter/src_movie.c
libavformat/version.h
libavutil/opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agortpdec_asf: Fix integer underflow that could allow remote code execution
Michael Niedermayer [Wed, 7 Sep 2011 12:12:42 +0000 (14:12 +0200)]
rtpdec_asf: Fix integer underflow that could allow remote code execution

Fixes MSVR-11-0088.
Credit:  Jeong Wook Oh of Microsoft and Microsoft Vulnerability Research (MSVR)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agortpdec_asf: fix memleak
Michael Niedermayer [Wed, 7 Sep 2011 14:48:49 +0000 (16:48 +0200)]
rtpdec_asf: fix memleak

Based on a suggestion by Ronald S. Bultje
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agortp: Fix integer underflow that could allow remote code execution.
Michael Niedermayer [Wed, 7 Sep 2011 12:12:42 +0000 (14:12 +0200)]
rtp: Fix integer underflow that could allow remote code execution.

Fixes MSVR-11-0088
Credit:  Jeong Wook Oh of Microsoft and Microsoft Vulnerability Research (MSVR)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoAdd LATM muxer
Kieran Kunhya [Tue, 6 Sep 2011 19:05:27 +0000 (20:05 +0100)]
Add LATM muxer

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
8 years agov210enc: clip values according to specifications
Baptiste Coudurier [Sun, 8 May 2011 15:58:20 +0000 (17:58 +0200)]
v210enc: clip values according to specifications

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agov210enc: switch to PIX_FMT_422P10
Baptiste Coudurier [Sun, 8 May 2011 15:57:54 +0000 (17:57 +0200)]
v210enc: switch to PIX_FMT_422P10

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agov210dec: switch to PIX_FMT_422P10
Baptiste Coudurier [Sun, 8 May 2011 15:54:20 +0000 (17:54 +0200)]
v210dec: switch to PIX_FMT_422P10

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoAVOptions: remove AVOption.offset <= 0 checks
Anton Khirnov [Mon, 5 Sep 2011 19:44:33 +0000 (21:44 +0200)]
AVOptions: remove AVOption.offset <= 0 checks

They will only ever be <=0 if the option is broken, in which case this
check is hiding a bug.

8 years agoAVOptions: deprecate av_opt_set_defaults2
Anton Khirnov [Sun, 4 Sep 2011 09:42:41 +0000 (11:42 +0200)]
AVOptions: deprecate av_opt_set_defaults2

It's a hack which was created to allow for multiple options with
different defaults to refer to same field (e.g. 'b' vs 'ab'). There is
no need for it anymore.

8 years agoAVOptions: move doxy for av_opt_set_defaults() from opt.c to opt.h
Anton Khirnov [Sun, 4 Sep 2011 09:39:49 +0000 (11:39 +0200)]
AVOptions: move doxy for av_opt_set_defaults() from opt.c to opt.h

Also change it to be more readable.

8 years agolibx264: fix setting some more parameters
Anton Khirnov [Wed, 7 Sep 2011 07:13:02 +0000 (09:13 +0200)]
libx264: fix setting some more parameters

Specifically, trellis, nr, me_range, me_method, subq, b_strategy,
keyint_min, chroma_me and coder.
Change their defaults to -1 and apply them after
x264_param_default_preset() if the user explicitly set them.

8 years agolibx264: fix setting the H.264 level
Andrej Peterka [Wed, 7 Sep 2011 06:27:28 +0000 (08:27 +0200)]
libx264: fix setting the H.264 level

Move setting it after x264_param_default_preset()

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agolibx264: add 'direct-pred' private option
Anton Khirnov [Thu, 1 Sep 2011 11:15:09 +0000 (13:15 +0200)]
libx264: add 'direct-pred' private option

Deprecate AVCodecContext.directpred

8 years agolibx264: add 'partitions' private option
Anton Khirnov [Thu, 1 Sep 2011 11:15:09 +0000 (13:15 +0200)]
libx264: add 'partitions' private option

Deprecate AVCodecContext.partitions.

8 years agoCorrect docs for boxblur parameters
Mark Himsley [Tue, 6 Sep 2011 20:30:18 +0000 (21:30 +0100)]
Correct docs for boxblur parameters

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoflvdec: A little bit of cleanup
Joseph Wecker [Sat, 27 Aug 2011 00:50:33 +0000 (17:50 -0700)]
flvdec: A little bit of cleanup

8 years agoflvenc: Correctly encode data stream into in-band metadata frames.
Joseph Wecker [Sat, 27 Aug 2011 00:42:22 +0000 (17:42 -0700)]
flvenc: Correctly encode data stream into in-band metadata frames.

8 years agoflvdec: Properly decoding in-band metadata packets as data frames.
Joseph Wecker [Sat, 27 Aug 2011 00:39:11 +0000 (17:39 -0700)]
flvdec: Properly decoding in-band metadata packets as data frames.

8 years agoflvdec: Started to remove most of the "only 1-audio+1-video" assumptions
Joseph Wecker [Fri, 26 Aug 2011 01:36:32 +0000 (18:36 -0700)]
flvdec: Started to remove most of the "only 1-audio+1-video" assumptions

8 years agoflv: Ammon's changes migrated from 0.6.0 - I believe for the android broadcaster.
Joseph Wecker [Thu, 25 Aug 2011 21:04:37 +0000 (14:04 -0700)]
flv: Ammon's changes migrated from 0.6.0 - I believe for the android broadcaster.

8 years agoSupport Speex in isom.
Carl Eugen Hoyos [Tue, 6 Sep 2011 22:19:02 +0000 (00:19 +0200)]
Support Speex in isom.

Adobe Flash Media Server produces such files although the f4v
specification does not allow Speex (nor Nellymoser).

8 years agoFix decoding of 2/4 bpp Tiff samples.
Carl Eugen Hoyos [Tue, 6 Sep 2011 22:17:02 +0000 (00:17 +0200)]
Fix decoding of 2/4 bpp Tiff samples.

8 years agoCosmetics: Fix comment.
Carl Eugen Hoyos [Tue, 6 Sep 2011 22:03:13 +0000 (00:03 +0200)]
Cosmetics: Fix comment.

8 years agolibavformat/utils: only run delta_dts_min calculation code when its value is used.
Michael Niedermayer [Tue, 6 Sep 2011 22:23:18 +0000 (00:23 +0200)]
libavformat/utils: only run delta_dts_min calculation code when its value is used.
This should improve speed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibavformat/utils: use FFMIN() where possible
Michael Niedermayer [Tue, 6 Sep 2011 22:13:09 +0000 (00:13 +0200)]
libavformat/utils: use FFMIN() where possible

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibavformat/utils: Treat subtitle streams as noninterleaved when 20 seconds have...
wg [Tue, 6 Sep 2011 22:10:44 +0000 (00:10 +0200)]
libavformat/utils: Treat subtitle streams as noninterleaved when 20 seconds have passed without a packet

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavfilter: dont crash on filters with NULL instance names.
Michael Niedermayer [Tue, 6 Sep 2011 20:16:26 +0000 (22:16 +0200)]
avfilter: dont crash on filters with NULL instance names.

Found-by: Rolf Siegrist
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 6 Sep 2011 19:35:18 +0000 (21:35 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libx264: add 'cplxblur' private option
  libx264: add 'deblock' private option
  libx264: add 'b-bias' private option
  libx264: fix setting some options.
  libx264: remove useless assignment
  ac3dec: avoid pointless alloc and indirection for input_buffer
  mpeg12: cosmetics: reformat as K&R

Conflicts:
libavcodec/libx264.c
libavcodec/mpeg12.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodshow: properly disconnect and remove filters from graph
Ramiro Polla [Fri, 2 Sep 2011 04:35:47 +0000 (01:35 -0300)]
dshow: properly disconnect and remove filters from graph

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodshow: remove some unused code
Ramiro Polla [Fri, 2 Sep 2011 04:33:24 +0000 (01:33 -0300)]
dshow: remove some unused code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovfwcap: actually use framerate option
Ramiro Polla [Fri, 2 Sep 2011 04:33:07 +0000 (01:33 -0300)]
vfwcap: actually use framerate option

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibx264: add 'cplxblur' private option
Anton Khirnov [Thu, 1 Sep 2011 11:15:09 +0000 (13:15 +0200)]
libx264: add 'cplxblur' private option

Deprecate AVCodecContext.complexityblur

8 years agolibx264: add 'deblock' private option
Anton Khirnov [Thu, 1 Sep 2011 11:15:09 +0000 (13:15 +0200)]
libx264: add 'deblock' private option

Deprecate AVCodecContext.deblockalpha/deblockbeta

8 years agolibx264: add 'b-bias' private option
Anton Khirnov [Thu, 1 Sep 2011 11:15:09 +0000 (13:15 +0200)]
libx264: add 'b-bias' private option

Deprecate AVCodecContext.bframebias.

8 years agolibx264: fix setting some options.
Anton Khirnov [Thu, 1 Sep 2011 10:59:29 +0000 (12:59 +0200)]
libx264: fix setting some options.

Specifically: gop_size, max_b_frames, scenechange_threshold, qmin, qmax,
max_qdiff, qblur, qcompress and refs.

Change their default values to -1 and only use them if the user
explicitly set them. Otherwise x264 defaults are used.

Move setting those options after x264_param_default_preset(), so they
don't get overwritten by it.

8 years agolibx264: remove useless assignment
Anton Khirnov [Wed, 31 Aug 2011 12:09:19 +0000 (14:09 +0200)]
libx264: remove useless assignment

priv_data is memset to 0.

8 years agopngdec: implement 4bpp interlaced
Michael Niedermayer [Tue, 6 Sep 2011 17:02:14 +0000 (19:02 +0200)]
pngdec: implement 4bpp interlaced
Fixes Ticket435

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopngdec: implement 2 bpp interlaced.
Michael Niedermayer [Tue, 6 Sep 2011 16:46:42 +0000 (18:46 +0200)]
pngdec: implement 2 bpp interlaced.
Fixes Ticket434

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavfi: rename vsink_buffer.c to sink_buffer.c, and vsink_buffer.h to buffersink.h
Stefano Sabatini [Tue, 6 Sep 2011 16:37:44 +0000 (18:37 +0200)]
lavfi: rename vsink_buffer.c to sink_buffer.c, and vsink_buffer.h to buffersink.h

This is done in order to clarify the non-video-specific nature of the
buffersink code, as the result of the video/audio API unification of
the previous commit, and for improving overall consistency.

8 years agolavfi: unify asink_buffer and vsink_buffer API
Stefano Sabatini [Thu, 18 Aug 2011 14:21:47 +0000 (16:21 +0200)]
lavfi: unify asink_buffer and vsink_buffer API

The new API is more generic (no distinction between audio/video for
pulling frames), and avoids code duplication.

A backward compatibility layer is kept for avoiding tools ABI breaks
(only for the video binary interface, audio interface was never used
in the tools).

8 years agoac3dec: avoid pointless alloc and indirection for input_buffer
Reimar Döffinger [Thu, 24 Mar 2011 20:27:05 +0000 (21:27 +0100)]
ac3dec: avoid pointless alloc and indirection for input_buffer

Since we now always allocate it, it can simply be made part of the context
instead.

8 years agomjpegdec; even better RSTn skiping
Michael Niedermayer [Tue, 6 Sep 2011 16:20:34 +0000 (18:20 +0200)]
mjpegdec; even better RSTn skiping
Fixes Ticket426

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopngdec: Fix interlaced PAETH prediction
Michael Niedermayer [Tue, 6 Sep 2011 14:22:38 +0000 (16:22 +0200)]
pngdec: Fix interlaced PAETH prediction
Fixes Ticket161

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopngdec: Implement 2bpp
Michael Niedermayer [Tue, 6 Sep 2011 13:48:01 +0000 (15:48 +0200)]
pngdec: Implement 2bpp
Fixes Ticket433

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopngdec: Fix interlaced 1bpp
Michael Niedermayer [Tue, 6 Sep 2011 13:28:36 +0000 (15:28 +0200)]
pngdec: Fix interlaced 1bpp
Fixes Ticket214

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agopngdec: 4bpp support
Michael Niedermayer [Tue, 6 Sep 2011 11:35:15 +0000 (13:35 +0200)]
pngdec: 4bpp support
Fixes Ticket208

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompeg12: cosmetics: reformat as K&R
Diego Biurrun [Tue, 6 Sep 2011 09:46:57 +0000 (11:46 +0200)]
mpeg12: cosmetics: reformat as K&R

8 years agompeg4: fix another packed divx issue.
Michael Niedermayer [Tue, 6 Sep 2011 02:09:43 +0000 (04:09 +0200)]
mpeg4: fix another packed divx issue.
Fixes getting_stuck.avi

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: map subtitle stream by default when user specified -scodec
Michael Niedermayer [Mon, 5 Sep 2011 22:49:23 +0000 (00:49 +0200)]
ffmpeg: map subtitle stream by default when user specified -scodec

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovf_drawtext: always use expanded_text as we always support strftime() now and dont...
Michael Niedermayer [Mon, 5 Sep 2011 21:01:49 +0000 (23:01 +0200)]
vf_drawtext: always use expanded_text as we always support strftime() now and dont depend on localtime_r() anymore

Found-by: Rolf Siegrist
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 5 Sep 2011 20:10:26 +0000 (22:10 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ac3enc: Add channel coupling support for the fixed-point AC-3 encoder.
  ac3enc: scale floating-point coupling channel coefficients in scale_coefficients() rather than in apply_channel_coupling()
  ac3enc: fix encoding of stereo ac3 files when rematrixing is disabled.
  wavpack: fix wrong return value in wavpack_decode_block()
  avconv: fix parsing metadata specifiers.
  fate: use +frame+slice named constants instead of '3'
  mpeg12: propagate more real return values through chunk decode error return and fix some indentation
  wavpack: use context reset in appropriate places
  avconv: move mux_preload and mux_max_delay to options context
  avconv: move bitstream filters to options context.
  avconv: move rate_emu to options context.
  avconv: move max_frames to options context.
  avconv: move metadata to options context.
  avconv: move ts scale to options context.
  avconv: move chapter maps to options context.
  avconv: move metadata maps to options context.
  avconv: move codec_names to options context.

Conflicts:
avconv.c
tests/fate-run.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswscale: Fix unused asm and enable it
Michael Niedermayer [Mon, 5 Sep 2011 16:42:44 +0000 (18:42 +0200)]
swscale: Fix unused asm and enable it
Author of the fix is ronald, the enabling & commit message are mine.

This fixes
commit 4e3e333a79272944b40695166438359b376d7864
Author: Ronald S. Bultje <rsbultje@gmail.com>
Date:   Tue Jul 5 12:49:11 2011 -0700

    swscale: error dithering for 16/9/10-bit to 8-bit.

    Based on a somewhat similar idea in FFmpeg's swscale copy.

The Fix was originally commited in: (and i missed it due to the commit message)
commit 5c391a161a1f71dcdafd3f59b45d80220845f501
Author: Ronald S. Bultje <rsbultje@gmail.com>
Date:   Fri Jul 8 14:39:04 2011 -0700

    swscale: rename uv_off/uv_off2 to uv_off_px/byte.

8 years agoac3enc: Add channel coupling support for the fixed-point AC-3 encoder.
Justin Ruggles [Sun, 7 Aug 2011 21:47:42 +0000 (17:47 -0400)]
ac3enc: Add channel coupling support for the fixed-point AC-3 encoder.

Update FATE references accordingly.

8 years agoac3enc: scale floating-point coupling channel coefficients in
Justin Ruggles [Sun, 7 Aug 2011 21:51:13 +0000 (17:51 -0400)]
ac3enc: scale floating-point coupling channel coefficients in
scale_coefficients() rather than in apply_channel_coupling()

8 years agoac3enc: fix encoding of stereo ac3 files when rematrixing is disabled.
Justin Ruggles [Fri, 26 Aug 2011 17:02:29 +0000 (13:02 -0400)]
ac3enc: fix encoding of stereo ac3 files when rematrixing is disabled.

The number of rematrixing bands still needs to be calculated.

8 years agowavpack: fix wrong return value in wavpack_decode_block()
Kostya Shishkov [Mon, 5 Sep 2011 10:37:50 +0000 (12:37 +0200)]
wavpack: fix wrong return value in wavpack_decode_block()

This function should return number of samples decoded, not number of bytes
decoded.
Spotted by Uoti Urpala.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
8 years agoavconv: fix parsing metadata specifiers.
Anton Khirnov [Mon, 5 Sep 2011 09:39:09 +0000 (11:39 +0200)]
avconv: fix parsing metadata specifiers.

After 039267f192f335144d9251e6f05a1513dd1e8ef1, metadata specifiers are
passed without the leading ':'. Remove a ++ that didn't take this into
account.

8 years agofate: use +frame+slice named constants instead of '3'
Anton Khirnov [Sun, 4 Sep 2011 08:01:59 +0000 (10:01 +0200)]
fate: use +frame+slice named constants instead of '3'

8 years agompeg12: propagate more real return values through chunk decode error return and fix...
Dustin Brody [Sat, 3 Sep 2011 19:38:17 +0000 (15:38 -0400)]
mpeg12: propagate more real return values through chunk decode error return and fix some indentation

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agowavpack: use context reset in appropriate places
Kostya Shishkov [Fri, 2 Sep 2011 09:37:39 +0000 (11:37 +0200)]
wavpack: use context reset in appropriate places

This fixes improper flushing in the cases when the same frame is decoded in
several iterations (for being too large to fit into output buffer) and flush is
called mid-decoding and it also resets context in case of decoding errors.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoavconv: move mux_preload and mux_max_delay to options context
Anton Khirnov [Wed, 31 Aug 2011 06:51:15 +0000 (08:51 +0200)]
avconv: move mux_preload and mux_max_delay to options context