ffmpeg.git
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 4 Dec 2011 00:02:37 +0000 (01:02 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: fix frame reordering code.
  fate: Add a test for the VBLE decoder
  doc: break some long lines in developer.texi
  drawtext: make x and y parametric
  drawtext: manage memory allocation better
  drawtext: refactor draw_text
  doc: remove space between variable and post increment in example code

Conflicts:
doc/developer.texi
doc/filters.texi
libavcodec/h264.c
libavfilter/vf_drawtext.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoflvdec: Stop searching for streams once a audio & a video stream has been found
Michael Niedermayer [Sat, 3 Dec 2011 17:58:28 +0000 (18:58 +0100)]
flvdec: Stop searching for streams once a audio & a video stream has been found
instead of when the 2nd stream has been found.
This isnt ideal as we will likely still like before miss a data stream.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoAdd forgotten %ifdef HAVE_AVX.
Reimar Döffinger [Sat, 3 Dec 2011 19:46:42 +0000 (20:46 +0100)]
Add forgotten %ifdef HAVE_AVX.

Fixes compilation with older YASM/NASM versions.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
9 years agoh264: fix frame reordering code.
Ronald S. Bultje [Wed, 30 Nov 2011 06:22:44 +0000 (22:22 -0800)]
h264: fix frame reordering code.

Fixes fate-h264-conformance-{mr2_tandberg_e,mr3_tandberg_b} without
requiring -strict 1.

9 years agolavu/error: define AVERROR_BUG.
Nicolas George [Sat, 3 Dec 2011 10:21:30 +0000 (11:21 +0100)]
lavu/error: define AVERROR_BUG.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavutil: av_x_if_null: remove const for the return value.
Nicolas George [Sat, 3 Dec 2011 10:21:29 +0000 (11:21 +0100)]
avutil: av_x_if_null: remove const for the return value.

This is the usual weirdness with const/non-const pointers through a function.
See the prototype of strchr for a standard example.

The function had to be moved down, below the point where stdint.h is
indirectly included.

Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: use standard duration calculation code in the stream copy case.
Michael Niedermayer [Sat, 3 Dec 2011 14:03:49 +0000 (15:03 +0100)]
ffmpeg: use standard duration calculation code in the stream copy case.
Fixes a.mkv non monotonic timestamps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoBMP: Support BMP OS/2 v2 with RLE compression.
ami_stuff [Sat, 3 Dec 2011 11:34:12 +0000 (12:34 +0100)]
BMP: Support BMP OS/2 v2 with RLE compression.

Fixes ticket #699.

Patch also provided by Peter Ross.

9 years agoAllow last mov chunk to have an arbitrary number of samples.
Carl Eugen Hoyos [Sat, 3 Dec 2011 11:29:41 +0000 (12:29 +0100)]
Allow last mov chunk to have an arbitrary number of samples.

Fixes ticket #673.

9 years agoSupport decoding right-to-left targa files.
Carl Eugen Hoyos [Sat, 3 Dec 2011 11:22:12 +0000 (12:22 +0100)]
Support decoding right-to-left targa files.

Fixes ticket #698.

9 years agoceltdec: adapt to avcodec_decode_audio4.
Nicolas George [Sat, 3 Dec 2011 10:52:48 +0000 (11:52 +0100)]
celtdec: adapt to avcodec_decode_audio4.

Original fix by Michael Niedermayer.
Slightly modified to avoid the now redundant multiplications
and divisions in the main code path.

9 years agooma: Fix out of array read.
Michael Niedermayer [Sat, 3 Dec 2011 04:27:04 +0000 (05:27 +0100)]
oma: Fix out of array read.

Input: 01-Untitled-partial.oma
ZZUF params: zzuf[s=7157,r=0.001]

Bug-found-by: darkshikari
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoid3v2: Fix null ptr crash in get_extra_meta_func()
Michael Niedermayer [Sat, 3 Dec 2011 04:04:31 +0000 (05:04 +0100)]
id3v2: Fix null ptr crash in get_extra_meta_func()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agozmbv: fix 2 memleaks
Michael Niedermayer [Sat, 3 Dec 2011 03:50:35 +0000 (04:50 +0100)]
zmbv: fix 2 memleaks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agozmbv: Fix keyframe fault protextion.
Michael Niedermayer [Sat, 3 Dec 2011 03:42:36 +0000 (04:42 +0100)]
zmbv: Fix keyframe fault protextion.
Fixes zzuf -s467 -r0.001 cat samples/zmbv/wc2_001-partial.avi

Bug-found-by: darkshikari
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoaudeo_get_buffer: fix pkt_pos
Michael Niedermayer [Sat, 3 Dec 2011 03:25:34 +0000 (04:25 +0100)]
audeo_get_buffer: fix pkt_pos

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodeveloper.texi: Fix naming convention
Michael Niedermayer [Sat, 3 Dec 2011 02:45:05 +0000 (03:45 +0100)]
developer.texi: Fix naming convention

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoiff: support ExtraHalfBrite (EHB) palette mode
Peter Ross [Sat, 3 Dec 2011 02:01:58 +0000 (13:01 +1100)]
iff: support ExtraHalfBrite (EHB) palette mode

Fixes ticket #663.

Based on patch by ami_stuff

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agopictordec: decode 8bpp images when extra header marker is missing
Peter Ross [Sat, 3 Dec 2011 01:21:33 +0000 (12:21 +1100)]
pictordec: decode 8bpp images when extra header marker is missing

Fixes ticket #696.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoSilence warnings when decoding QNAP Systems H264 codec.
Carl Eugen Hoyos [Sat, 3 Dec 2011 02:31:24 +0000 (03:31 +0100)]
Silence warnings when decoding QNAP Systems H264 codec.

Fixes ticket #571.

9 years agolavf: rename remaining av_set_pts_info() to avpriv_set_pts_info().
Clément Bœsch [Fri, 2 Dec 2011 23:45:46 +0000 (00:45 +0100)]
lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info().

9 years agog723_1dec: update to new API
Michael Niedermayer [Sat, 3 Dec 2011 01:43:58 +0000 (02:43 +0100)]
g723_1dec: update to new API

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agog729dec: update to the new API
Michael Niedermayer [Sat, 3 Dec 2011 01:26:01 +0000 (02:26 +0100)]
g729dec: update to the new API

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 3 Dec 2011 01:08:55 +0000 (02:08 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aac_latm: reconfigure decoder on audio specific config changes
  latmdec: fix audio specific config parsing
  Add avcodec_decode_audio4().
  avcodec: change number of plane pointers from 4 to 8 at next major bump.
  Update developers documentation with coding conventions.
  svq1dec: avoid undefined get_bits(0) call
  ARM: h264dsp_neon cosmetics
  ARM: make some NEON macros reusable
  Do not memcpy raw video frames when using null muxer
  fate: update asf seektest
  vp8: flush buffers on size changes.
  doc: improve general documentation for MacOSX
  asf: use packet dts as approximation of pts
  asf: do not call av_read_frame
  rtsp: Initialize the media_type_mask in the rtp guessing demuxer
  Cleaned up alacenc.c

Conflicts:
doc/APIchanges
doc/developer.texi
libavcodec/8svx.c
libavcodec/aacdec.c
libavcodec/ac3dec.c
libavcodec/avcodec.h
libavcodec/nellymoserdec.c
libavcodec/tta.c
libavcodec/utils.c
libavcodec/version.h
libavcodec/wmadec.c
libavformat/asfdec.c
tests/ref/seek/lavf_asf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agofate: Add a test for the VBLE decoder
Derek Buitenhuis [Thu, 1 Dec 2011 20:24:08 +0000 (20:24 +0000)]
fate: Add a test for the VBLE decoder

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agodoc: break some long lines in developer.texi
Luca Barbato [Sat, 3 Dec 2011 00:18:28 +0000 (01:18 +0100)]
doc: break some long lines in developer.texi

9 years agodrawtext: make x and y parametric
Luca Barbato [Thu, 1 Dec 2011 10:43:11 +0000 (11:43 +0100)]
drawtext: make x and y parametric

Introduce variables "E", "PHI", "PI", "main_w"/"W", "main_h"/"H",
"text_w"/"w", "text_h"/"h", "x", "y", "n" and "t" in line with
vf_overlay and refactor the code accordingly.

9 years agodrawtext: manage memory allocation better
Luca Barbato [Thu, 1 Dec 2011 10:27:19 +0000 (11:27 +0100)]
drawtext: manage memory allocation better

Call dtext_prepare_text as early as possible
Do not draw if the memory allocation failed

9 years agodrawtext: refactor draw_text
Luca Barbato [Thu, 1 Dec 2011 10:14:54 +0000 (11:14 +0100)]
drawtext: refactor draw_text

Split the memory allocation from the actual drawing.

9 years agodoc: remove space between variable and post increment in example code
Janne Grunau [Sat, 3 Dec 2011 00:11:12 +0000 (01:11 +0100)]
doc: remove space between variable and post increment in example code

9 years agoswr-test: drop one const, silence most const qualifer warnings.
Michael Niedermayer [Fri, 2 Dec 2011 23:46:46 +0000 (00:46 +0100)]
swr-test: drop one const, silence most const qualifer warnings.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoaac_latm: reconfigure decoder on audio specific config changes
Janne Grunau [Sat, 22 Oct 2011 20:04:00 +0000 (22:04 +0200)]
aac_latm: reconfigure decoder on audio specific config changes

9 years agolatmdec: fix audio specific config parsing
Janne Grunau [Fri, 21 Oct 2011 15:25:30 +0000 (17:25 +0200)]
latmdec: fix audio specific config parsing

Pass the correct size in bits to mpeg4audio_get_config and add a flag
to disable parsing of the sync extension when the size is not known.

Latm with AudioMuxVersion 0 does not specify the size of the audio
specific config. Data after the audio specific config can be
misinterpreted as sync extension resulting in random and wrong configs.

9 years agoswr-test_: Fix mixed declaration and statements:
Michael Niedermayer [Fri, 2 Dec 2011 23:40:15 +0000 (00:40 +0100)]
swr-test_: Fix mixed declaration and statements:

swresample_test.c:123:21: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]
swresample_test.c:127:25: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavutil: increase struct SampleFmtInfo member 'name' length to 8
Giorgio Vazzana [Fri, 2 Dec 2011 23:10:56 +0000 (00:10 +0100)]
libavutil: increase struct SampleFmtInfo member 'name' length to 8

This is necessary since some sample format names are longer than 3 characters.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoswscale: Fix all cast qualifier warnings:
Michael Niedermayer [Fri, 2 Dec 2011 23:11:51 +0000 (00:11 +0100)]
swscale: Fix all cast qualifier warnings:

libswscale/swscale.c:2744:40: warning: to be safe all intermediate pointers in cast from ‘int16_t **’ to ‘const int16_t **’ must be ‘const’ qualified [-Wcast-qual]
libswscale/swscale.c:2745:41: warning: to be safe all intermediate pointers in cast from ‘int16_t **’ to ‘const int16_t **’ must be ‘const’ qualified [-Wcast-qual]
libswscale/swscale.c:2746:41: warning: to be safe all intermediate pointers in cast from ‘int16_t **’ to ‘const int16_t **’ must be ‘const’ qualified [-Wcast-qual]
libswscale/swscale.c:2747:78: warning: to be safe all intermediate pointers in cast from ‘int16_t **’ to ‘const int16_t **’ must be ‘const’ qualified [-Wcast-qual]

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoswscale_mmx: Fix cast qualifier warnings:
Michael Niedermayer [Fri, 2 Dec 2011 23:09:03 +0000 (00:09 +0100)]
swscale_mmx: Fix cast qualifier warnings:

libswscale/x86/swscale_mmx.c:131:36: warning: to be safe all intermediate pointers in cast from ‘int16_t **’ to ‘const int16_t **’ must be ‘const’ qualified [-Wcast-qual]
libswscale/x86/swscale_mmx.c:132:37: warning: to be safe all intermediate pointers in cast from ‘int16_t **’ to ‘const int16_t **’ must be ‘const’ qualified [-Wcast-qual]
libswscale/x86/swscale_mmx.c:133:74: warning: to be safe all intermediate pointers in cast from ‘int16_t **’ to ‘const int16_t **’ must be ‘const’ qualified [-Wcast-qual]

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agosws: remove unused variable
Michael Niedermayer [Fri, 2 Dec 2011 23:04:42 +0000 (00:04 +0100)]
sws: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoAdd avcodec_decode_audio4().
Justin Ruggles [Tue, 6 Sep 2011 16:17:45 +0000 (12:17 -0400)]
Add avcodec_decode_audio4().

Deprecate avcodec_decode_audio3().
Implement audio support in avcodec_default_get_buffer().
Implement the new audio decoder API in all audio decoders.

9 years agoavcodec: change number of plane pointers from 4 to 8 at next major bump.
Justin Ruggles [Mon, 14 Nov 2011 21:07:03 +0000 (16:07 -0500)]
avcodec: change number of plane pointers from 4 to 8 at next major bump.

Add AV_NUM_DATA_POINTERS to simplify the bump transition.
This will allow for supporting more planar audio channels without having to
allocate separate pointer arrays.

9 years agodoc/example/muxing: fix video timestamps
Michael Niedermayer [Fri, 2 Dec 2011 22:31:20 +0000 (23:31 +0100)]
doc/example/muxing: fix video timestamps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoUpdate developers documentation with coding conventions.
Victor Vasiliev [Thu, 1 Dec 2011 16:45:44 +0000 (20:45 +0400)]
Update developers documentation with coding conventions.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agomuxing example: set encoder defaults
Michael Niedermayer [Fri, 2 Dec 2011 21:49:00 +0000 (22:49 +0100)]
muxing example: set encoder defaults

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agosvq1dec: avoid undefined get_bits(0) call
Mans Rullgard [Sat, 26 Nov 2011 15:30:34 +0000 (15:30 +0000)]
svq1dec: avoid undefined get_bits(0) call

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agoARM: h264dsp_neon cosmetics
Mans Rullgard [Fri, 2 Dec 2011 16:45:00 +0000 (16:45 +0000)]
ARM: h264dsp_neon cosmetics

- Replace 'ip' with 'r12'.
- Use correct size designators for vld1/vst1.
- Whitespace fixes.

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agoARM: make some NEON macros reusable
Janne Grunau [Tue, 29 Nov 2011 13:38:10 +0000 (13:38 +0000)]
ARM: make some NEON macros reusable

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agoDo not memcpy raw video frames when using null muxer
Mans Rullgard [Tue, 29 Nov 2011 18:38:02 +0000 (18:38 +0000)]
Do not memcpy raw video frames when using null muxer

Commit 035af99 made avconv always call an encoder when using the
null muxer.  While useful for 2-pass encodes, it inadvertently
caused an extra memcpy of raw frames when decoding only.

This hack restores the old behaviour when only decoding while
allowing use of the null muxer with encoded streams as well.

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agofate: update asf seektest
Luca Barbato [Fri, 2 Dec 2011 13:07:45 +0000 (14:07 +0100)]
fate: update asf seektest

9 years agovp8: flush buffers on size changes.
Aaron Colwell [Mon, 28 Nov 2011 15:21:47 +0000 (07:21 -0800)]
vp8: flush buffers on size changes.

9 years agopictordec: support uncompressed images
Peter Ross [Fri, 2 Dec 2011 08:57:34 +0000 (19:57 +1100)]
pictordec: support uncompressed images

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodoc: improve general documentation for MacOSX
Luca Barbato [Fri, 2 Dec 2011 09:26:00 +0000 (10:26 +0100)]
doc: improve general documentation for MacOSX

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agoasf: use packet dts as approximation of pts
John Stebbins [Tue, 15 Nov 2011 02:56:37 +0000 (03:56 +0100)]
asf: use packet dts as approximation of pts

Having a somehow off seeking is better than having none at all.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
9 years agoasf: do not call av_read_frame
Luca Barbato [Mon, 14 Nov 2011 14:18:49 +0000 (15:18 +0100)]
asf: do not call av_read_frame

The asf_read_pts should read the bitstream directly.

9 years agortsp: Initialize the media_type_mask in the rtp guessing demuxer
Martin Storsjö [Fri, 2 Dec 2011 09:06:18 +0000 (11:06 +0200)]
rtsp: Initialize the media_type_mask in the rtp guessing demuxer

The media_type_mask is initialized via AVOptions for the
rtsp and sdp demuxers, but it isn't available as an option
for the rtp guessing demuxer (since it doesn't really make
sense there). Therefore, it must be manually initialized
instead, since a zero value means no media types at all
are accepted.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoCleaned up alacenc.c
Nathan Adil Maxson [Thu, 1 Dec 2011 05:37:33 +0000 (21:37 -0800)]
Cleaned up alacenc.c

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoBe less verbose when skipping RBSP data in H264 PPS.
Carl Eugen Hoyos [Fri, 2 Dec 2011 02:29:24 +0000 (03:29 +0100)]
Be less verbose when skipping RBSP data in H264 PPS.

Fixes ticket #693.

9 years agoBe less verbose when skipping MPEG-4 ASP frames.
Carl Eugen Hoyos [Fri, 2 Dec 2011 02:27:14 +0000 (03:27 +0100)]
Be less verbose when skipping MPEG-4 ASP frames.

Fixes ticket #560.

9 years agoSupport yuva420p encoding via libopenjpeg.
Carl Eugen Hoyos [Fri, 2 Dec 2011 02:26:21 +0000 (03:26 +0100)]
Support yuva420p encoding via libopenjpeg.

9 years agoSupport tiff RGBA encoding.
Carl Eugen Hoyos [Fri, 2 Dec 2011 02:23:07 +0000 (03:23 +0100)]
Support tiff RGBA encoding.

9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 1 Dec 2011 23:51:11 +0000 (00:51 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (25 commits)
  rtpenc: Add support for G726 audio
  rtpdec: Interpret the different G726 names as bits_per_coded_sample
  rtpenc: Change rtp_send_samples to handle sample sizes other than even bytes
  rtpenc: Cast a rescaling parameter to int64_t
  h264: cap max has_b_frames at MAX_DELAYED_PIC_COUNT - 1.
  ARM: fix indentation in ff_dsputil_init_neon()
  ARM: NEON put/avg_pixels8/16 cosmetics
  ARM: add remaining NEON avg_pixels8/16 functions
  ARM: clean up NEON put/avg_pixels macros
  fate: split acodec-pcm into individual tests
  swscale: #include "libavutil/mathematics.h"
  pmpdec: don't use deprecated av_set_pts_info.
  rv34: align temporary block of "dct" coefs
  Add PlayStation Portable PMP format demuxer
  proto: Realign struct initializers
  proto: Use .priv_data_size to allocate the private context
  mmsh: Properly clean up if the second ffurl_alloc failed
  rtmp: Clean up properly if the handshake failed
  md5proto: Remove the get_file_handle function
  applehttpproto: Use the close function if the open function fails
  ...

Conflicts:
libavcodec/vble.c
libavformat/mmsh.c
libavformat/pmpdec.c
libavformat/udp.c
tests/ref/acodec/pcm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoSupport transparency in 32bit bmp files.
Carl Eugen Hoyos [Thu, 1 Dec 2011 23:21:24 +0000 (00:21 +0100)]
Support transparency in 32bit bmp files.

9 years agoRevert "libutvideodec: Make buf_size local"
Derek Buitenhuis [Thu, 1 Dec 2011 22:20:19 +0000 (17:20 -0500)]
Revert "libutvideodec: Make buf_size local"

This change was dependent on a different patch that
never actually made it into FFmpeg, and it actually
ended up breaking builds.

This reverts commit 70cf7bb958899c369f778e29b8bd4203723bed04.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoFix id3v2 extended header handling.
Adrian Drzewiecki [Thu, 1 Dec 2011 22:27:41 +0000 (23:27 +0100)]
Fix id3v2 extended header handling.

When skipping over the extended header, take into account
that the size field has already been read. The extended header
also takes up space, so adjust total header length accordingly.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoconfigure: add forgotten libx264rgb_encoder_deps
Michael Niedermayer [Thu, 1 Dec 2011 21:29:58 +0000 (22:29 +0100)]
configure: add forgotten libx264rgb_encoder_deps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agortpenc: Add support for G726 audio
Martin Storsjö [Wed, 30 Nov 2011 21:11:50 +0000 (23:11 +0200)]
rtpenc: Add support for G726 audio

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agortpdec: Interpret the different G726 names as bits_per_coded_sample
Martin Storsjö [Thu, 1 Dec 2011 08:45:26 +0000 (10:45 +0200)]
rtpdec: Interpret the different G726 names as bits_per_coded_sample

For the standardized 8 kHz sample rate, this works exactly the same.
For nonstandard sample rates, the different predefined G726
names (G726-16, G726-24, G726-32, G726-40) are interpreted as an
indication of the bits per coded sample, even though their
actual bitrates aren't what the name specifies.

This feels more sane than using free-form names for nonstandard
sample rate/bitrate combinations, e.g like G726-22, G726-33
for 11025 Hz.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agortpenc: Change rtp_send_samples to handle sample sizes other than even bytes
Martin Storsjö [Wed, 30 Nov 2011 21:10:54 +0000 (23:10 +0200)]
rtpenc: Change rtp_send_samples to handle sample sizes other than even bytes

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agortpenc: Cast a rescaling parameter to int64_t
Martin Storsjö [Wed, 30 Nov 2011 20:03:43 +0000 (22:03 +0200)]
rtpenc: Cast a rescaling parameter to int64_t

This avoids overflow if frame_size is over 2147, since both
frame_size and AV_TIME_BASE are plain integers.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoh264: cap max has_b_frames at MAX_DELAYED_PIC_COUNT - 1.
Ronald S. Bultje [Thu, 1 Dec 2011 20:45:10 +0000 (12:45 -0800)]
h264: cap max has_b_frames at MAX_DELAYED_PIC_COUNT - 1.

This prevents frame allocation overflows, and fixed
fate-h264-conformance-mr3_tandberg_b with 2 threads.

9 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Thu, 1 Dec 2011 20:35:10 +0000 (21:35 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: Copy audio side data too. This fixes handling of some rare nellymoser files that change the sample rate mid stream (sample file at: http://trac.videolan.org/vlc/ticket/5586)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibx264: Implement rgb24 support through a seperate AVCodec.
Michael Niedermayer [Thu, 1 Dec 2011 20:02:57 +0000 (21:02 +0100)]
libx264: Implement rgb24 support through a seperate AVCodec.
This avoids people mistakely encoding in a way that many players dont support.
Fixes Ticket658

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffplay: Copy audio side data too. This fixes handling of some rare nellymoser files...
Michael Niedermayer [Wed, 30 Nov 2011 20:33:34 +0000 (21:33 +0100)]
ffplay: Copy audio side data too. This fixes handling of some rare nellymoser files that change the sample rate mid stream (sample file at: trac.videolan.org/vlc/ticket/5586)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Marton Balint <cus@passwd.hu>
9 years agoARM: fix indentation in ff_dsputil_init_neon()
Mans Rullgard [Thu, 1 Dec 2011 18:39:02 +0000 (18:39 +0000)]
ARM: fix indentation in ff_dsputil_init_neon()

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agoARM: NEON put/avg_pixels8/16 cosmetics
Mans Rullgard [Thu, 1 Dec 2011 15:01:44 +0000 (15:01 +0000)]
ARM: NEON put/avg_pixels8/16 cosmetics

This makes whitespace and register names consistent with
the style used in more recent code.

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agoARM: add remaining NEON avg_pixels8/16 functions
Mans Rullgard [Thu, 1 Dec 2011 05:07:09 +0000 (05:07 +0000)]
ARM: add remaining NEON avg_pixels8/16 functions

9 years agoARM: clean up NEON put/avg_pixels macros
Mans Rullgard [Thu, 1 Dec 2011 05:04:32 +0000 (05:04 +0000)]
ARM: clean up NEON put/avg_pixels macros

Although this adds a few lines, the macro calls are less convoluted.

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agolibx264: fix generic boolean support
Michael Niedermayer [Thu, 1 Dec 2011 19:38:14 +0000 (20:38 +0100)]
libx264: fix generic boolean support
Fixes Ticket660

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agofate: split acodec-pcm into individual tests
Justin Ruggles [Wed, 30 Nov 2011 21:51:01 +0000 (16:51 -0500)]
fate: split acodec-pcm into individual tests

this removes 2 redundant tests for pcm in mkv.
we can add the coverage back in later as fate-lavf tests if needed.

9 years agoswscale: #include "libavutil/mathematics.h"
Reinhard Tartler [Thu, 1 Dec 2011 17:48:33 +0000 (18:48 +0100)]
swscale: #include "libavutil/mathematics.h"

this file uses the M_PI macro since
4e74187db2f5db52f88729efc662df9d6bc763e1, so include the correct header
directly.

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
9 years agovc1_parser: fix NULL pointer dereference
Michael Niedermayer [Thu, 1 Dec 2011 17:35:58 +0000 (18:35 +0100)]
vc1_parser: fix NULL pointer dereference
Fixes Ticket456

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoSupport ffmpeg -dn to disable copying data streams.
Carl Eugen Hoyos [Thu, 1 Dec 2011 17:02:04 +0000 (18:02 +0100)]
Support ffmpeg -dn to disable copying data streams.

Fixes ticket #647.

9 years agoh264: More restrictive more_rbsp_data_in_pps()
Michael Niedermayer [Thu, 1 Dec 2011 16:28:46 +0000 (17:28 +0100)]
h264: More restrictive more_rbsp_data_in_pps()
Fixes Ticket697

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agopmpdec: don't use deprecated av_set_pts_info.
Anton Khirnov [Thu, 1 Dec 2011 16:28:36 +0000 (17:28 +0100)]
pmpdec: don't use deprecated av_set_pts_info.

9 years agorv34: align temporary block of "dct" coefs
Mans Rullgard [Thu, 1 Dec 2011 00:18:38 +0000 (00:18 +0000)]
rv34: align temporary block of "dct" coefs

This is needed for optimised transforms.

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agopictordec: prevent segfault when reading corrupted files
Peter Ross [Thu, 1 Dec 2011 08:17:16 +0000 (19:17 +1100)]
pictordec: prevent segfault when reading corrupted files

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agopictordec: use correct context for another av_log
Peter Ross [Thu, 1 Dec 2011 08:16:59 +0000 (19:16 +1100)]
pictordec: use correct context for another av_log

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoAdd PlayStation Portable PMP format demuxer
Reimar Döffinger [Sat, 26 Mar 2011 15:25:10 +0000 (16:25 +0100)]
Add PlayStation Portable PMP format demuxer

Not yet complete, for demuxing AAC the AAC header must be generated
manually.
Possibly the decoder could accept the header as extradata to simplify
this.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agoproto: Realign struct initializers
Martin Storsjö [Thu, 1 Dec 2011 09:53:57 +0000 (11:53 +0200)]
proto: Realign struct initializers

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoproto: Use .priv_data_size to allocate the private context
Martin Storsjö [Thu, 1 Dec 2011 09:44:21 +0000 (11:44 +0200)]
proto: Use .priv_data_size to allocate the private context

This simplifies the open functions by avoiding one function
call that needs error checking, reducing the amount of
extra bulk code.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agommsh: Properly clean up if the second ffurl_alloc failed
Martin Storsjö [Thu, 1 Dec 2011 09:48:03 +0000 (11:48 +0200)]
mmsh: Properly clean up if the second ffurl_alloc failed

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agortmp: Clean up properly if the handshake failed
Martin Storsjö [Thu, 1 Dec 2011 09:34:06 +0000 (11:34 +0200)]
rtmp: Clean up properly if the handshake failed

This prevents memory leaks if this function returns an error.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agomd5proto: Remove the get_file_handle function
Martin Storsjö [Thu, 1 Dec 2011 09:30:03 +0000 (11:30 +0200)]
md5proto: Remove the get_file_handle function

The private data pointer isn't a file handle, this protocol
doesn't have any file handle to return.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agoapplehttpproto: Use the close function if the open function fails
Martin Storsjö [Thu, 1 Dec 2011 09:07:35 +0000 (11:07 +0200)]
applehttpproto: Use the close function if the open function fails

This should clean up leaked memory.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agohttp: Make sure proxyauth is initialized
Martin Storsjö [Thu, 1 Dec 2011 09:24:23 +0000 (11:24 +0200)]
http: Make sure proxyauth is initialized

This string will be passed to ff_http_auth_create_response
even if no proxy is used, resulting in reading uninitialized
memory. The other auth string is always initialized by
av_url_split.

Signed-off-by: Martin Storsjö <martin@martin.st>
9 years agovble: use dsp.add_hfyu_median_prediction() this allows asm optimizations to be used.
Michael Niedermayer [Wed, 30 Nov 2011 22:28:51 +0000 (17:28 -0500)]
vble: use dsp.add_hfyu_median_prediction() this allows asm optimizations to be used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agovble: remove flags copy, its not used in any speed relevant code.
Michael Niedermayer [Wed, 30 Nov 2011 22:28:50 +0000 (17:28 -0500)]
vble: remove flags copy, its not used in any speed relevant code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agovble: merge len and val arrays
Derek Buitenhuis [Wed, 30 Nov 2011 22:28:49 +0000 (17:28 -0500)]
vble: merge len and val arrays

There's no reason to use two arrays for this.

Based off commit 2fea60c60084c4e70d7cef128ea3bca5690ce465
to FFmpeg by Michael Niedermayer.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agovble: remove unused variable len.
Michael Niedermayer [Wed, 30 Nov 2011 22:28:48 +0000 (17:28 -0500)]
vble: remove unused variable len.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoffmpeg: fix segfault with ffmpeg -h
Michael Niedermayer [Thu, 1 Dec 2011 03:32:27 +0000 (04:32 +0100)]
ffmpeg: fix segfault with ffmpeg -h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: fix changing sample rate handling
Michael Niedermayer [Thu, 1 Dec 2011 03:06:59 +0000 (04:06 +0100)]
ffmpeg: fix changing sample rate handling

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