ffmpeg.git
8 years agoffmpeg: make -a/v/sn work with -map
Michael Niedermayer [Thu, 6 Oct 2011 19:59:50 +0000 (21:59 +0200)]
ffmpeg: make -a/v/sn work with -map

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavf/utils: document AVIndexEntry.timestamp
Michael Niedermayer [Thu, 6 Oct 2011 18:20:43 +0000 (20:20 +0200)]
lavf/utils: document AVIndexEntry.timestamp

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswresample: Try to handle cases with input channel count and layout mismatching.
Michael Niedermayer [Thu, 6 Oct 2011 17:17:38 +0000 (19:17 +0200)]
swresample: Try to handle cases with input channel count and layout mismatching.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agobintext: fix warning message wording.
Clément Bœsch [Thu, 6 Oct 2011 16:42:28 +0000 (18:42 +0200)]
bintext: fix warning message wording.

8 years agovaapi: fix VC-1 decoding (reconstruct bitstream TTFRM correctly).
Gwenole Beauchesne [Thu, 6 Oct 2011 13:19:33 +0000 (15:19 +0200)]
vaapi: fix VC-1 decoding (reconstruct bitstream TTFRM correctly).

8 years agompegps: drop incorrect line of sofdec detection
Michael Niedermayer [Thu, 6 Oct 2011 10:10:23 +0000 (12:10 +0200)]
mpegps: drop incorrect line of sofdec detection

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompeg1dec: More complete sofdec support
Michael Niedermayer [Thu, 6 Oct 2011 10:09:33 +0000 (12:09 +0200)]
mpeg1dec: More complete sofdec support

Fixes Ticket517

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibmodplug: free file content buffer in read_close() callback.
Clément Bœsch [Thu, 6 Oct 2011 06:50:56 +0000 (08:50 +0200)]
libmodplug: free file content buffer in read_close() callback.

8 years agolibmodplug: add TODO entry for probing.
Clément Bœsch [Wed, 5 Oct 2011 23:40:26 +0000 (01:40 +0200)]
libmodplug: add TODO entry for probing.

8 years agolibmodplug: add metadata support.
Clément Bœsch [Wed, 5 Oct 2011 23:19:02 +0000 (01:19 +0200)]
libmodplug: add metadata support.

8 years agolibmodplug: add an option to enlarge the max supported file size.
Clément Bœsch [Wed, 5 Oct 2011 20:47:46 +0000 (22:47 +0200)]
libmodplug: add an option to enlarge the max supported file size.

8 years agolibmodplug: support options (noise reduction, reverb, bass boost, ...)
Clément Bœsch [Wed, 5 Oct 2011 19:02:49 +0000 (21:02 +0200)]
libmodplug: support options (noise reduction, reverb, bass boost, ...)

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 6 Oct 2011 01:42:14 +0000 (03:42 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Fix 'heigth' vs. 'height' typos.
  lavc/lavf: use unique private classes.
  lavc: use designated initializers for av_codec_context_class

Conflicts:
libavdevice/fbdev.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: fix forced key frames.
Nicolas George [Wed, 5 Oct 2011 12:01:46 +0000 (14:01 +0200)]
ffmpeg: fix forced key frames.

Now that the option was moved in the per-stream context,
the parsing is done before the time_base for the stream is decided.
This patch does the parsing in AV_TIME_BASE units and rescales the
timestamps later when the correct time base is known.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoflvenc: Ignore metadata that has special values and is stored already based on
Michael Niedermayer [Thu, 6 Oct 2011 01:20:57 +0000 (03:20 +0200)]
flvenc: Ignore metadata that has special values and is stored already based on
more correct values.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoswr-docs: update due to last change to swresample
Michael Niedermayer [Wed, 5 Oct 2011 22:32:01 +0000 (00:32 +0200)]
swr-docs: update due to last change to swresample

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibswresample: support directly converting sampleformats and packed/planar in a singl...
Michael Niedermayer [Wed, 5 Oct 2011 21:46:50 +0000 (23:46 +0200)]
libswresample: support directly converting sampleformats and packed/planar in a single pass.

Previously a intermediate planar format was used when both input and output where packed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoupdate_stream_timings: Remove redundant check.
Michael Niedermayer [Wed, 5 Oct 2011 19:47:51 +0000 (21:47 +0200)]
update_stream_timings: Remove redundant check.

Found-by:Nicolas
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibmodplug: handle EOF correctly.
Clément Bœsch [Wed, 5 Oct 2011 21:44:46 +0000 (23:44 +0200)]
libmodplug: handle EOF correctly.

8 years agoUse WMAv2 as default audio codec for asf.
Carl Eugen Hoyos [Wed, 5 Oct 2011 21:41:35 +0000 (23:41 +0200)]
Use WMAv2 as default audio codec for asf.

8 years agoUse M4S2 as default video tag for MPEG-4 ASP in asf.
Carl Eugen Hoyos [Wed, 5 Oct 2011 21:39:57 +0000 (23:39 +0200)]
Use M4S2 as default video tag for MPEG-4 ASP in asf.

8 years agolibmodplug: simplify and fix read_packet() callback.
Clément Bœsch [Wed, 5 Oct 2011 19:20:28 +0000 (21:20 +0200)]
libmodplug: simplify and fix read_packet() callback.

In case of av_new_packet() error, a correct return error code is raised,
the data memcpy is avoided, and pkt dts/pts are not assigned anymore
(since the defaults are good).

8 years agolibmodplug: consistent use of sizeof.
Clément Bœsch [Wed, 5 Oct 2011 19:06:11 +0000 (21:06 +0200)]
libmodplug: consistent use of sizeof.

8 years agogeneric seeking: fail if there are 1000 non keyframes found with no keyframe.
Michael Niedermayer [Wed, 5 Oct 2011 16:23:47 +0000 (18:23 +0200)]
generic seeking: fail if there are 1000 non keyframes found with no keyframe.
This avoids scanning through a whole file just to fail.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix 'heigth' vs. 'height' typos.
Diego Biurrun [Wed, 5 Oct 2011 09:12:01 +0000 (11:12 +0200)]
Fix 'heigth' vs. 'height' typos.

8 years agolavc/lavf: use unique private classes.
Anton Khirnov [Mon, 3 Oct 2011 17:14:03 +0000 (19:14 +0200)]
lavc/lavf: use unique private classes.

This is needed by the new AVOptions API.

8 years agolavc: use designated initializers for av_codec_context_class
Anton Khirnov [Mon, 3 Oct 2011 12:13:17 +0000 (14:13 +0200)]
lavc: use designated initializers for av_codec_context_class

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 5 Oct 2011 02:07:59 +0000 (04:07 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  qcelpdec: cosmetics: do not add line break before opening bracket in 'for', 'while', 'if/else', and 'switch' statements.
  qcelp: check output buffer size before decoding
  qcelpdec: fix the return value of qcelp_decode_frame().
  sipr: fix the output data size check and only calculate it once.
  Synchronize various 4CCs and codec tags from FFmpeg.
  qdm2: check output buffer size before decoding
  Fix out of bound reads in the QDM2 decoder.
  Check for out of bound writes in the QDM2 decoder.
  ogg/celt: do not set sample_fmt in the demuxer

Conflicts:
libavcodec/avcodec.h
libavcodec/qdm2.c
libavformat/oggparsecelt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoh264: remove assert() on ref_frame_count.
Michael Niedermayer [Wed, 5 Oct 2011 01:15:39 +0000 (03:15 +0200)]
h264: remove assert() on ref_frame_count.

This assert can fail if a SPS with a smaller value becomes active.
Fixes Ticket532

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoconfigure: fix compilation without libmodplug
Michael Niedermayer [Tue, 4 Oct 2011 22:33:06 +0000 (00:33 +0200)]
configure: fix compilation without libmodplug

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoh264: do not let invalid values in h->ref_count after a decoder reset.
Laurent Aimar [Tue, 4 Oct 2011 20:13:58 +0000 (22:13 +0200)]
h264: do not let invalid values in h->ref_count after a decoder reset.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoh264: bit depth/chroma idc changes must go through a full format negociation.
Laurent Aimar [Tue, 4 Oct 2011 20:13:57 +0000 (22:13 +0200)]
h264: bit depth/chroma idc changes must go through a full format negociation.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoh254: explicitly initialize bit depth/chroma idc
Laurent Aimar [Tue, 4 Oct 2011 20:13:56 +0000 (22:13 +0200)]
h254: explicitly initialize bit depth/chroma idc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibx264: Fix loop failure due to bufsize becoming 0
Michael Niedermayer [Tue, 4 Oct 2011 21:21:52 +0000 (23:21 +0200)]
libx264: Fix loop failure due to bufsize becoming 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoqcelpdec: cosmetics: do not add line break before opening bracket in 'for',
Justin Ruggles [Wed, 14 Sep 2011 17:46:48 +0000 (13:46 -0400)]
qcelpdec: cosmetics: do not add line break before opening bracket in 'for',
'while', 'if/else', and 'switch' statements.

also fixes some spacing, but only if already changing a line

8 years agoqcelp: check output buffer size before decoding
Justin Ruggles [Wed, 14 Sep 2011 17:38:07 +0000 (13:38 -0400)]
qcelp: check output buffer size before decoding

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

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agoAdd libmodplug support.
Clément Bœsch [Tue, 4 Oct 2011 18:47:16 +0000 (20:47 +0200)]
Add libmodplug support.

8 years agosipr: fix the output data size check and only calculate it once.
Justin Ruggles [Tue, 20 Sep 2011 19:27:44 +0000 (15:27 -0400)]
sipr: fix the output data size check and only calculate it once.

8 years agodeshake: simplify filename check.
Clément Bœsch [Tue, 4 Oct 2011 19:36:30 +0000 (21:36 +0200)]
deshake: simplify filename check.

8 years agoconfigure: remove bashism equality check for target_os.
Clément Bœsch [Tue, 4 Oct 2011 19:34:55 +0000 (21:34 +0200)]
configure: remove bashism equality check for target_os.

8 years agodeshake: misc style fixes.
Clément Bœsch [Tue, 4 Oct 2011 19:33:54 +0000 (21:33 +0200)]
deshake: misc style fixes.

8 years agodeshake: move angles from stack to heap.
Michael Niedermayer [Tue, 4 Oct 2011 16:32:36 +0000 (18:32 +0200)]
deshake: move angles from stack to heap.
Fixes Ticket530

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodeshake: Allow specifying the filename for statistics and disable them by default.
Michael Niedermayer [Tue, 4 Oct 2011 15:20:42 +0000 (17:20 +0200)]
deshake: Allow specifying the filename for statistics and disable them by default.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoSynchronize various 4CCs and codec tags from FFmpeg.
Diego Biurrun [Fri, 30 Sep 2011 15:28:28 +0000 (17:28 +0200)]
Synchronize various 4CCs and codec tags from FFmpeg.

8 years agodeshake: remove non const static
Michael Niedermayer [Tue, 4 Oct 2011 06:25:23 +0000 (08:25 +0200)]
deshake: remove non const static

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodoxygen: remove a few @file parameters.
Clément Bœsch [Tue, 4 Oct 2011 06:04:17 +0000 (08:04 +0200)]
doxygen: remove a few @file parameters.

It is not mandatory and prevents breakage on rename.

8 years agolavfi: remove align tabs in Makefile.
Clément Bœsch [Tue, 4 Oct 2011 05:56:56 +0000 (07:56 +0200)]
lavfi: remove align tabs in Makefile.

8 years agoass_split: fix invalid doxygen group end markers.
Clément Bœsch [Tue, 4 Oct 2011 05:47:24 +0000 (07:47 +0200)]
ass_split: fix invalid doxygen group end markers.

8 years agoproresdec_gpl: remove wrong @file reference.
Clément Bœsch [Tue, 4 Oct 2011 05:41:28 +0000 (07:41 +0200)]
proresdec_gpl: remove wrong @file reference.

8 years agobintext: remove wrong @file reference.
Clément Bœsch [Tue, 4 Oct 2011 05:41:04 +0000 (07:41 +0200)]
bintext: remove wrong @file reference.

8 years agodeshake: fix doxygen comments.
Clément Bœsch [Tue, 4 Oct 2011 05:39:57 +0000 (07:39 +0200)]
deshake: fix doxygen comments.

8 years agoisom: replace pseudo doxycomments with normal comments.
Clément Bœsch [Tue, 4 Oct 2011 05:26:50 +0000 (07:26 +0200)]
isom: replace pseudo doxycomments with normal comments.

Those chunks don't need to be parsed and they weren't parsed correctly
by Doxygen anyway.

8 years agopngdec: set reference correctly for corepng.
Michael Niedermayer [Tue, 4 Oct 2011 04:39:29 +0000 (06:39 +0200)]
pngdec: set reference correctly for corepng.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoff_dv_frame_profile2: Check input buffer size.
Michael Niedermayer [Tue, 4 Oct 2011 02:21:19 +0000 (04:21 +0200)]
ff_dv_frame_profile2: Check input buffer size.

Based on code by DivX, Inc. / drffmpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agocinepak: detect keyframes
Michael Niedermayer [Tue, 4 Oct 2011 02:13:32 +0000 (04:13 +0200)]
cinepak: detect keyframes

Code by DivX, Inc.
Taken from drffmpeg
Author: unknown

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoqdm2: check output buffer size before decoding
Justin Ruggles [Wed, 14 Sep 2011 17:57:04 +0000 (13:57 -0400)]
qdm2: check output buffer size before decoding

8 years agoFix out of bound reads in the QDM2 decoder.
Laurent Aimar [Fri, 30 Sep 2011 22:45:04 +0000 (00:45 +0200)]
Fix out of bound reads in the QDM2 decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agoCheck for out of bound writes in the QDM2 decoder.
Laurent Aimar [Fri, 30 Sep 2011 22:45:05 +0000 (00:45 +0200)]
Check for out of bound writes in the QDM2 decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 4 Oct 2011 01:21:14 +0000 (03:21 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  id3v2: remove pointless casts
  id3v2: read TXXX frames with two calls to decode_str() instead of one.
  id3v2: don't discard the whole tag when encountering empty frames.
  libvpx: fix build with older libvpx versions.
  ARM: check for inline asm 'y' operand modifier support

Conflicts:
libavcodec/libvpxenc.c
libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoogg/celt: do not set sample_fmt in the demuxer
Justin Ruggles [Mon, 26 Sep 2011 19:06:33 +0000 (15:06 -0400)]
ogg/celt: do not set sample_fmt in the demuxer

8 years agolibvpxenc: support vpxencs command line options.
Luca Barbato [Tue, 4 Oct 2011 01:01:06 +0000 (03:01 +0200)]
libvpxenc: support vpxencs command line options.
This simplifies useage for users who are used to vpxenc.
We continue to support the previous options with the exception of the flags
for which it would be slightly messy.

8 years agodeshake: nicer looking defaults
Michael Niedermayer [Tue, 4 Oct 2011 00:15:18 +0000 (02:15 +0200)]
deshake: nicer looking defaults

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibavfilter: add deshake filter
danielgtaylor [Mon, 3 Oct 2011 23:31:18 +0000 (01:31 +0200)]
libavfilter: add deshake filter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibavfilter: image transform code
danielgtaylor [Tue, 4 Oct 2011 00:10:18 +0000 (02:10 +0200)]
libavfilter: image transform code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoH264: hotfix for speedloss on frame threading and h264 files with slices.
Michael Niedermayer [Mon, 3 Oct 2011 22:14:48 +0000 (00:14 +0200)]
H264: hotfix for speedloss on frame threading and h264 files with slices.

This fix is not ideal as it still limits the multithreading on field pictures
to the 2nd field only.
Ill try to fix it properly to allow both fields to decode concurrently but this
needs more work.

This bug exists since and was caused by:
commit ea6331f8bbaf3343faec6ffe77a6218a016a3af5
Author: Ronald S. Bultje <rsbultje@gmail.com>
Date:   Mon Jun 20 10:24:33 2011 -0400

    h264-mt: fix deadlock in packets with multiple slices (e.g. MP4).

8 years agothreads: warn in case of multiple finished setup calls.
Michael Niedermayer [Mon, 3 Oct 2011 19:25:58 +0000 (21:25 +0200)]
threads: warn in case of multiple finished setup calls.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoh264_parser: print AU size on error.
Michael Niedermayer [Mon, 3 Oct 2011 18:40:17 +0000 (20:40 +0200)]
h264_parser: print AU size on error.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoh264_parser: AVC support.
Michael Niedermayer [Mon, 3 Oct 2011 18:25:43 +0000 (20:25 +0200)]
h264_parser: AVC support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agofate: fix due to new yuv444 formats
Michael Niedermayer [Mon, 3 Oct 2011 21:30:02 +0000 (23:30 +0200)]
fate: fix due to new yuv444 formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRELEASE: 0.8.5 has been released
Dominique Leuenberger [Mon, 3 Oct 2011 07:09:57 +0000 (09:09 +0200)]
RELEASE: 0.8.5 has been released

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoEnable conversions to YUV444P9/YUV444P10, they seem to work fine.
Reimar Döffinger [Mon, 3 Oct 2011 19:30:58 +0000 (21:30 +0200)]
Enable conversions to YUV444P9/YUV444P10, they seem to work fine.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agolavf/utils: fix overestimation of the rational number density.
Michael Niedermayer [Mon, 3 Oct 2011 14:32:17 +0000 (16:32 +0200)]
lavf/utils: fix overestimation of the rational number density.
Fixes Ticket498

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompegtsenc: Lift limit on PMT PID
Loren Osborn [Mon, 3 Oct 2011 14:03:29 +0000 (16:03 +0200)]
mpegtsenc: Lift limit on PMT PID
Fixes Ticket518

8 years agolibcdio: Fix missing avclass in context
chinshou [Mon, 3 Oct 2011 13:40:40 +0000 (15:40 +0200)]
libcdio: Fix missing avclass in context
Fixes Ticket526

8 years agoid3v2: remove pointless casts
Anton Khirnov [Sun, 2 Oct 2011 07:14:30 +0000 (09:14 +0200)]
id3v2: remove pointless casts

8 years agoid3v2: read TXXX frames with two calls to decode_str() instead of one.
Anton Khirnov [Sun, 2 Oct 2011 07:06:34 +0000 (09:06 +0200)]
id3v2: read TXXX frames with two calls to decode_str() instead of one.

Read the key in the first, value in the second.

This allows to avoid pointless strdups and simplify decode_str() by
dropping two of its parameters.

8 years agoid3v2: don't discard the whole tag when encountering empty frames.
Anton Khirnov [Sun, 2 Oct 2011 05:16:09 +0000 (07:16 +0200)]
id3v2: don't discard the whole tag when encountering empty frames.

While they're technically invalid, it's better to skip them and try to
read the rest of the tag.

8 years agolibvpx: fix build with older libvpx versions.
Anton Khirnov [Sun, 2 Oct 2011 14:10:53 +0000 (16:10 +0200)]
libvpx: fix build with older libvpx versions.

VPX_ERROR_RESILIENT_DEFAULT and VPX_ERROR_RESILIENT_PARTITIONS weren't
defined before 4cb0ebe5b27d35ccc2a78c1d16f2622ddef21f74 (CommitDate: Tue
Jun 28 11:10:17 2011)

8 years agoARM: check for inline asm 'y' operand modifier support
Mans Rullgard [Sun, 2 Oct 2011 22:38:32 +0000 (23:38 +0100)]
ARM: check for inline asm 'y' operand modifier support

The inline asm added in bf5d46d uses the 'y' modifier which
is only supported from gcc 4.5.  This check allows building
with older compilers.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoVP8: armv6 optimizations.
Ronald S. Bultje [Wed, 24 Aug 2011 20:58:37 +0000 (13:58 -0700)]
VP8: armv6 optimizations.

From 52.503s (~40fps) to 27.973sec (~80fps) decoding of 480p sintel
trailer, i.e. a ~2x speedup overall, on a Nexus S.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavutil: bump for av_get_default_channel_layout()
Michael Niedermayer [Sun, 2 Oct 2011 23:17:42 +0000 (01:17 +0200)]
avutil: bump for av_get_default_channel_layout()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 2 Oct 2011 23:02:45 +0000 (01:02 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpc8: check output buffer size before decoding
  mpc7: return error if packet is too small.
  mpc7: check output buffer size before decoding
  nellymoserdec: allocate float_buf only when decoding to int16
  nellymoserdec: use NELLY_BUF_LEN instead of 128
  nellymoserdec: use NELLY_BLOCK_LEN instead of 64 when appropriate.
  nellymoserdec: allow user to request SAMPLE_FMT_FLT for output samples.
  nellymoser: check output buffer size before decoding
  win32: improve threading algorithm warning

Conflicts:
libavcodec/nellymoserdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMAINTAINERS: new ffplay maintainer
Michael Niedermayer [Sun, 2 Oct 2011 22:38:50 +0000 (00:38 +0200)]
MAINTAINERS: new ffplay maintainer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sun, 2 Oct 2011 21:53:21 +0000 (23:53 +0200)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: use libswresample instead of av_audio_convert
  audioconvert: add av_get_default_channel_layout public function
  ffplay: use avctx->channels and avctx->freq before avcodec_open2 consistently
  ffplay: remove now unnecessary request_channels, we set it now with options
  ffplay: set request_channels to 2

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoriff: map 0x0038 to amrnb, works on http://video.mopoto.com/4/40/407/40709.avi
Compn [Sun, 2 Oct 2011 21:39:03 +0000 (17:39 -0400)]
riff: map 0x0038 to amrnb, works on video.mopoto.com/4/40/407/40709.avi

8 years agoffplay: use libswresample instead of av_audio_convert
Marton Balint [Tue, 16 Aug 2011 23:28:23 +0000 (01:28 +0200)]
ffplay: use libswresample instead of av_audio_convert

Previously ffplay expected SDL_AudioOpen to provide the requested sample rate
and channel number. This is no longer a requirement because this patch replaces
the audio convert function with libswresample's swr_convert which is capable of
handling different sample formats, sample rates and different number of
channels and different channel layouts.

The patch also removes the hardcoded 16bit samples assumption and uses
av_get_bytes_per_sample almost everywhere. The only exceptions are
the update_sample_display and video_audio_display functions, it
seemed too much of a headache to make them generic.

We also fix a tiny bug in sdl_audio_callback, we ensure that the number of
bytes when we put silence in the buffer is a multiple of the frame size.

8 years agoaudioconvert: add av_get_default_channel_layout public function
Marton Balint [Sun, 2 Oct 2011 14:28:36 +0000 (16:28 +0200)]
audioconvert: add av_get_default_channel_layout public function

8 years agoffplay: use avctx->channels and avctx->freq before avcodec_open2 consistently
Marton Balint [Sun, 2 Oct 2011 09:00:40 +0000 (11:00 +0200)]
ffplay: use avctx->channels and avctx->freq before avcodec_open2 consistently

8 years agoffplay: remove now unnecessary request_channels, we set it now with options
Marton Balint [Sun, 2 Oct 2011 10:05:20 +0000 (12:05 +0200)]
ffplay: remove now unnecessary request_channels, we set it now with options

8 years agoffplay: set request_channels to 2
Michael Niedermayer [Sat, 1 Oct 2011 23:25:14 +0000 (01:25 +0200)]
ffplay: set request_channels to 2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoh264: fix intra 16x16 mode check when using mbaff and constrained_intra_pred.
Laurent Aimar [Sun, 2 Oct 2011 19:07:41 +0000 (21:07 +0200)]
h264: fix intra 16x16 mode check when using mbaff and constrained_intra_pred.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolibvpxenc: cosmetics to make code more similar to lucas.
Michael Niedermayer [Sun, 2 Oct 2011 18:38:38 +0000 (20:38 +0200)]
libvpxenc: cosmetics to make code more similar to lucas.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoh264: check for invalid bit depth value.
Laurent Aimar [Sun, 2 Oct 2011 16:29:31 +0000 (18:29 +0200)]
h264: check for invalid bit depth value.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoh264: add entries for 11 and 12 bits in ff_h264_chroma_qp[][]
Laurent Aimar [Sun, 2 Oct 2011 16:29:30 +0000 (18:29 +0200)]
h264: add entries for 11 and 12 bits in ff_h264_chroma_qp[][]

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoh264: fix the check for invalid SPS:num_ref_frames.
Laurent Aimar [Sun, 2 Oct 2011 14:06:38 +0000 (16:06 +0200)]
h264: fix the check for invalid SPS:num_ref_frames.

This patch set the limit to 16.

For information, thoses previous commits:
41f7e2d11d2dca23842ee89d530ca9fa15cec9d8
5cbb0e70a0a2ee99eb3cb09e837b9a1f7355b9bc
assumed it was either 30 or 32.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoh264: do not let invalid values in h->ref_count on ff_h264_decode_ref_pic_list_reorde...
Laurent Aimar [Sun, 2 Oct 2011 14:06:37 +0000 (16:06 +0200)]
h264: do not let invalid values in h->ref_count on ff_h264_decode_ref_pic_list_reordering() errors.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoReject video with non multiple of 16 width/height in the 4xm decoder.
Laurent Aimar [Sat, 1 Oct 2011 00:04:45 +0000 (02:04 +0200)]
Reject video with non multiple of 16 width/height in the 4xm decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompc8: check output buffer size before decoding
Justin Ruggles [Wed, 14 Sep 2011 15:39:21 +0000 (11:39 -0400)]
mpc8: check output buffer size before decoding

8 years agompc7: return error if packet is too small.
Justin Ruggles [Wed, 14 Sep 2011 15:16:42 +0000 (11:16 -0400)]
mpc7: return error if packet is too small.