ffmpeg.git
8 years agoAdd coverage support.
Reimar Döffinger [Tue, 29 Nov 2011 19:35:48 +0000 (20:35 +0100)]
Add coverage support.

Adds --enable-coverage to configure and a "coverage-html" make target.
The dependency stuff in the Makefile is a bit questionable, but the
best I could think of so far.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agolavc: Mark fields that require av_opt_ptr()
Michael Niedermayer [Mon, 5 Dec 2011 12:23:17 +0000 (13:23 +0100)]
lavc: Mark fields that require av_opt_ptr()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavc: Fix sizeof(AVFrame) useability docs
Michael Niedermayer [Mon, 5 Dec 2011 12:22:46 +0000 (13:22 +0100)]
lavc: Fix sizeof(AVFrame) useability docs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavc: Document AVFrame av_opt_ptr() relation.
Michael Niedermayer [Mon, 5 Dec 2011 12:22:20 +0000 (13:22 +0100)]
lavc: Document AVFrame av_opt_ptr() relation.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffplay: Avoid directly accessing AVFrame fields that differ between forks.
Michael Niedermayer [Sat, 3 Dec 2011 20:21:30 +0000 (21:21 +0100)]
ffplay: Avoid directly accessing AVFrame fields that differ between forks.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: Avoid directly accessing AVFrame fields that differ between forks.
Michael Niedermayer [Sat, 3 Dec 2011 20:20:50 +0000 (21:20 +0100)]
ffmpeg: Avoid directly accessing AVFrame fields that differ between forks.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavc: Add a AVClass for AVFrames.
Michael Niedermayer [Sat, 3 Dec 2011 20:17:52 +0000 (21:17 +0100)]
lavc: Add a AVClass for AVFrames.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoav_opt: add av_opt_ptr() to return a pointer to a field of a object based on
Michael Niedermayer [Sat, 3 Dec 2011 20:16:46 +0000 (21:16 +0100)]
av_opt: add av_opt_ptr() to return a pointer to a field of a object based on
an AVClass

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: handle stream copy timebase selection for mp4 as if it had VFPS set.
Michael Niedermayer [Mon, 5 Dec 2011 02:19:28 +0000 (03:19 +0100)]
ffmpeg: handle stream copy timebase selection for mp4 as if it had VFPS set.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 4 Dec 2011 23:11:57 +0000 (00:11 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  adpcmenc: cosmetics: pretty-printing
  ac3dec: cosmetics: pretty-printing
  yuv4mpeg: cosmetics: pretty-printing
  shorten: remove dead initialization
  roqvideodec: set AVFrame reference before reget_buffer.
  bmp: fix some 1bit samples.
  latmdec: add fate test for audio config change
  oma: PCM support
  oma: better format detection with small probe buffer
  oma: clearify ambiguous if condition
  wavpack: Properly clip samples during lossy decode
  Code clean-up for crc.c, lfg.c, log.c, random_see.d, rational.c and tree.c.
  Cleaned pixdesc.c file in libavutil
  zmbv.c: coding style clean-up.
  xan.c: coding style clean-up.
  mpegvideo.c: code cleanup - first 500 lines.

Conflicts:
Changelog
libavcodec/adpcmenc.c
libavcodec/bmp.c
libavcodec/zmbv.c
libavutil/log.c
libavutil/pixdesc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoadpcmenc: cosmetics: pretty-printing
Chris Berov [Fri, 2 Dec 2011 19:52:49 +0000 (21:52 +0200)]
adpcmenc: cosmetics: pretty-printing

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agoac3dec: cosmetics: pretty-printing
Chris Berov [Fri, 2 Dec 2011 15:46:01 +0000 (17:46 +0200)]
ac3dec: cosmetics: pretty-printing

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agoyuv4mpeg: cosmetics: pretty-printing
Chris Berov [Wed, 30 Nov 2011 11:16:07 +0000 (13:16 +0200)]
yuv4mpeg: cosmetics: pretty-printing

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agolavfi: add life source
Stefano Sabatini [Sun, 26 Jun 2011 17:47:18 +0000 (19:47 +0200)]
lavfi: add life source

8 years agoaevalsrc: add duration option
Stefano Sabatini [Fri, 2 Dec 2011 14:33:15 +0000 (15:33 +0100)]
aevalsrc: add duration option

8 years agoshorten: remove dead initialization
Paul B. Mahol [Tue, 29 Nov 2011 01:52:58 +0000 (01:52 +0000)]
shorten: remove dead initialization

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
8 years agoMicrosoft Windows ICO demuxer
Peter Ross [Sun, 4 Dec 2011 06:45:24 +0000 (17:45 +1100)]
Microsoft Windows ICO demuxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoroqvideodec: set AVFrame reference before reget_buffer.
Reimar Döffinger [Sat, 5 Nov 2011 22:27:00 +0000 (23:27 +0100)]
roqvideodec: set AVFrame reference before reget_buffer.

Otherwise it might return a write-only frame which would break
decoding completely.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agobmp: fix some 1bit samples.
Carl Eugen Hoyos [Thu, 10 Nov 2011 22:07:27 +0000 (23:07 +0100)]
bmp: fix some 1bit samples.

<= 8bpp BMP images always have palette.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agolatmdec: add fate test for audio config change
Janne Grunau [Fri, 2 Dec 2011 23:21:06 +0000 (00:21 +0100)]
latmdec: add fate test for audio config change

8 years agodoc/filters.texi: Update drawtext docs so that the documented input width/height...
Michael Niedermayer [Sun, 4 Dec 2011 14:31:58 +0000 (15:31 +0100)]
doc/filters.texi: Update drawtext docs so that the documented input width/height variables are compatible with qatar.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovf_drawtext: support W/H parameters to reduce UI differences to qatar
Michael Niedermayer [Sun, 4 Dec 2011 14:29:26 +0000 (15:29 +0100)]
vf_drawtext: support W/H parameters to reduce UI differences to qatar

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: select best pixel format for the encoder if no exact match.
Michael Niedermayer [Sun, 4 Dec 2011 14:26:52 +0000 (15:26 +0100)]
ffmpeg: select best pixel format for the encoder if no exact match.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agooma: PCM support
David Goldwich [Fri, 2 Dec 2011 04:54:21 +0000 (05:54 +0100)]
oma: PCM support

Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agooma: better format detection with small probe buffer
David Goldwich [Fri, 2 Dec 2011 04:54:20 +0000 (05:54 +0100)]
oma: better format detection with small probe buffer

Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agooma: clearify ambiguous if condition
David Goldwich [Fri, 2 Dec 2011 04:54:19 +0000 (05:54 +0100)]
oma: clearify ambiguous if condition

Signed-off-by: David Goldwich <david.goldwich@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agovf_drawtext: cosmetics to reduce diff to qatar
Michael Niedermayer [Sun, 4 Dec 2011 01:27:13 +0000 (02:27 +0100)]
vf_drawtext: cosmetics to reduce diff to qatar

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovf_drawtext: Add main_w/h to improve compatibility with the modified UI
Michael Niedermayer [Sun, 4 Dec 2011 01:08:56 +0000 (02:08 +0100)]
vf_drawtext: Add main_w/h to improve compatibility with the modified UI
from the fork.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoh264: show when has_b_frames is being increased.
Michael Niedermayer [Sun, 4 Dec 2011 00:41:22 +0000 (01:41 +0100)]
h264: show when has_b_frames is being increased.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 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>
8 years agowavpack: Properly clip samples during lossy decode
Derek Buitenhuis [Sat, 3 Dec 2011 19:35:23 +0000 (14:35 -0500)]
wavpack: Properly clip samples during lossy decode

When decoding lossy WavPack samples, they are supposed
to be clipped, in order to be decoded correctly.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoCode clean-up for crc.c, lfg.c, log.c, random_see.d, rational.c and tree.c.
Yordan Makariev [Sat, 3 Dec 2011 18:25:57 +0000 (20:25 +0200)]
Code clean-up for crc.c, lfg.c, log.c, random_see.d, rational.c and tree.c.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoCleaned pixdesc.c file in libavutil
Tsvetelina Borisova [Sat, 3 Dec 2011 18:23:52 +0000 (20:23 +0200)]
Cleaned pixdesc.c file in libavutil

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agozmbv.c: coding style clean-up.
Nathan Adil Maxson [Fri, 2 Dec 2011 19:08:56 +0000 (11:08 -0800)]
zmbv.c: coding style clean-up.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoxan.c: coding style clean-up.
Nathan Adil Maxson [Fri, 2 Dec 2011 23:00:16 +0000 (15:00 -0800)]
xan.c: coding style clean-up.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agompegvideo.c: code cleanup - first 500 lines.
Konstantin Todorov [Wed, 30 Nov 2011 20:55:45 +0000 (22:55 +0200)]
mpegvideo.c: code cleanup - first 500 lines.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 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>
8 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>
8 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.

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

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

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

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

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

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

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

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

8 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

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

8 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

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

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

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

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

8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 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>
8 years agofate: update asf seektest
Luca Barbato [Fri, 2 Dec 2011 13:07:45 +0000 (14:07 +0100)]
fate: update asf seektest

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

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

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

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

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

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

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

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