ffmpeg.git
7 years agolavfi/pan: copy ref props after filtering samples.
Clément Bœsch [Tue, 31 Jan 2012 07:20:42 +0000 (08:20 +0100)]
lavfi/pan: copy ref props after filtering samples.

At least PTS needs to be copied to avoid breaking options such as -t in
ffmpeg.

7 years agolavfi/aconvert: use libswresample.
Clément Bœsch [Thu, 26 Jan 2012 07:49:15 +0000 (08:49 +0100)]
lavfi/aconvert: use libswresample.

This commit also drops the planar parameter; you now need to use the 'p'
suffix in order to request a planar sample format.

7 years agolavfi/aresample: use libswresample.
Clément Bœsch [Sat, 21 Jan 2012 19:26:31 +0000 (20:26 +0100)]
lavfi/aresample: use libswresample.

7 years agolavfi/aformat: use do..while(0) form for macro.
Clément Bœsch [Thu, 26 Jan 2012 08:43:17 +0000 (09:43 +0100)]
lavfi/aformat: use do..while(0) form for macro.

This avoids some empty statements.

7 years agodoc: document amerge filter as an alternative for the -map_channel limitation.
Clément Bœsch [Tue, 10 Jan 2012 10:47:46 +0000 (11:47 +0100)]
doc: document amerge filter as an alternative for the -map_channel limitation.

7 years agotimecode: drop lavc timecode on next bump.
Clément Bœsch [Mon, 16 Jan 2012 16:04:04 +0000 (17:04 +0100)]
timecode: drop lavc timecode on next bump.

7 years agodvenc: use new public timecode API.
Clément Bœsch [Mon, 16 Jan 2012 12:43:42 +0000 (13:43 +0100)]
dvenc: use new public timecode API.

7 years agomxfenc: use new public timecode API.
Clément Bœsch [Mon, 16 Jan 2012 13:19:37 +0000 (14:19 +0100)]
mxfenc: use new public timecode API.

7 years agogxfenc: use new public timecode API.
Clément Bœsch [Mon, 16 Jan 2012 15:10:22 +0000 (16:10 +0100)]
gxfenc: use new public timecode API.

7 years agompeg12enc: use new public timecode API.
Clément Bœsch [Mon, 16 Jan 2012 13:45:46 +0000 (14:45 +0100)]
mpeg12enc: use new public timecode API.

7 years agodrawtext: use new public timecode API.
Clément Bœsch [Mon, 16 Jan 2012 10:41:39 +0000 (11:41 +0100)]
drawtext: use new public timecode API.

7 years agodv: use new public timecode API.
Clément Bœsch [Tue, 31 Jan 2012 10:44:27 +0000 (11:44 +0100)]
dv: use new public timecode API.

7 years agomov: honor tmcd flags while extracting timecode meta.
Clément Bœsch [Tue, 31 Jan 2012 09:52:47 +0000 (10:52 +0100)]
mov: honor tmcd flags while extracting timecode meta.

7 years agomov: use new public timecode API.
Clément Bœsch [Mon, 23 Jan 2012 14:10:43 +0000 (15:10 +0100)]
mov: use new public timecode API.

7 years agompeg12: use av_mpegtc_to_timecode_string().
Clément Bœsch [Mon, 16 Jan 2012 10:30:05 +0000 (11:30 +0100)]
mpeg12: use av_mpegtc_to_timecode_string().

7 years agoffprobe: use av_mpegtc_to_timecode_string().
Clément Bœsch [Mon, 16 Jan 2012 10:24:52 +0000 (11:24 +0100)]
ffprobe: use av_mpegtc_to_timecode_string().

7 years agolavu: add public timecode API.
Clément Bœsch [Mon, 16 Jan 2012 10:20:46 +0000 (11:20 +0100)]
lavu: add public timecode API.

7 years agotimecode: add write regressions tests.
Clément Bœsch [Mon, 23 Jan 2012 13:48:08 +0000 (14:48 +0100)]
timecode: add write regressions tests.

7 years agoUse the correct pix_fmt for 32bit x11grab.
Carl Eugen Hoyos [Thu, 2 Feb 2012 12:29:14 +0000 (13:29 +0100)]
Use the correct pix_fmt for 32bit x11grab.

Remove adding a constant value to each pixel to make it opaque.

7 years agocosmetics: realign vertically
Paul B Mahol [Thu, 2 Feb 2012 01:56:32 +0000 (01:56 +0000)]
cosmetics: realign vertically

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoapedec: Fix alignment and fate.
Michael Niedermayer [Thu, 2 Feb 2012 03:34:28 +0000 (04:34 +0100)]
apedec: Fix alignment and fate.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 2 Feb 2012 01:02:18 +0000 (02:02 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (22 commits)
  frwu: Employ more meaningful return values.
  fraps: Use av_fast_padded_malloc() instead of av_realloc()
  mjpegdec: use av_fast_padded_malloc()
  eatqi: use av_fast_padded_malloc()
  asv1: use av_fast_padded_malloc()
  avcodec: Add av_fast_padded_malloc().
  swscale: enable dithering in MMX functions.
  swscale: make rgb24 function macros slightly smaller.
  avcodec.h: Remove some disabled cruft.
  swscale: remove obsolete comment.
  swscale-test: Drop unused argc and argv arguments from main().
  zmbv: Employ more meaningful return values.
  zmbvenc: Employ more meaningful return values.
  vc1: prevent null pointer dereference on broken files
  zmbv: check av_realloc() return values and avoid memleaks on ENOMEM
  truespeech: align buffer
  ac3: Do not read past the end of ff_ac3_band_start_tab.
  dv: Fix small stack overread related to CVE-2011-3929 and CVE-2011-3936.
  dv: Fix null pointer dereference due to ach=0
  dv: check stype
  ...

Conflicts:
doc/APIchanges
libavcodec/asv1.c
libavcodec/avcodec.h
libavcodec/eatqi.c
libavcodec/fraps.c
libavcodec/frwu.c
libavcodec/zmbv.c
libavformat/dv.c
libswscale/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodiracdec: Check for negative quants which would cause out of array reads.
Michael Niedermayer [Sun, 29 Jan 2012 04:04:25 +0000 (05:04 +0100)]
diracdec: Check for negative quants which would cause out of array reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoproresdec: Fix read via negative index in a global array.
Michael Niedermayer [Sun, 29 Jan 2012 03:39:37 +0000 (04:39 +0100)]
proresdec: Fix read via negative index in a global array.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc: ffv1 is not experimental any more
Paul B Mahol [Wed, 1 Feb 2012 21:25:06 +0000 (21:25 +0000)]
doc: ffv1 is not experimental any more

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofrwu: Employ more meaningful return values.
Paul B Mahol [Wed, 1 Feb 2012 21:05:16 +0000 (21:05 +0000)]
frwu: Employ more meaningful return values.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agofraps: Use av_fast_padded_malloc() instead of av_realloc()
Reimar Döffinger [Tue, 31 Jan 2012 16:30:34 +0000 (11:30 -0500)]
fraps: Use av_fast_padded_malloc() instead of av_realloc()

Ensures alignment and avoids using uninitialized data.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agomjpegdec: use av_fast_padded_malloc()
Reimar Döffinger [Mon, 30 Jan 2012 23:35:35 +0000 (18:35 -0500)]
mjpegdec: use av_fast_padded_malloc()

also check for allocation failure

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agoeatqi: use av_fast_padded_malloc()
Reimar Döffinger [Mon, 30 Jan 2012 23:34:10 +0000 (18:34 -0500)]
eatqi: use av_fast_padded_malloc()

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agoasv1: use av_fast_padded_malloc()
Reimar Döffinger [Mon, 30 Jan 2012 23:33:32 +0000 (18:33 -0500)]
asv1: use av_fast_padded_malloc()

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
7 years agoffserver: fix program reference
Michael Niedermayer [Wed, 1 Feb 2012 18:33:51 +0000 (19:33 +0100)]
ffserver: fix program reference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1dec: PIX_FMT_YUV440P support
Paul B Mahol [Wed, 1 Feb 2012 01:54:18 +0000 (01:54 +0000)]
ffv1dec: PIX_FMT_YUV440P support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1enc: PIX_FMT_YUV440P support
Paul B Mahol [Wed, 1 Feb 2012 01:54:17 +0000 (01:54 +0000)]
ffv1enc: PIX_FMT_YUV440P support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavcodec: Add av_fast_padded_malloc().
Janne Grunau [Tue, 31 Jan 2012 15:40:11 +0000 (15:40 +0000)]
avcodec: Add av_fast_padded_malloc().

Wrapper around av_fast_malloc() that keeps FF_INPUT_BUFFER_PADDING_SIZE
zero-padded bytes at the end of the used buffer.

Based on a patch by Reimar Döffinger <Reimar.Doeffinger@gmx.de>.

7 years agoswscale: enable dithering in MMX functions.
Ronald S. Bultje [Wed, 1 Feb 2012 15:38:57 +0000 (07:38 -0800)]
swscale: enable dithering in MMX functions.

This was accidently disabled.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agoswscale: make rgb24 function macros slightly smaller.
Ronald S. Bultje [Wed, 1 Feb 2012 15:38:54 +0000 (07:38 -0800)]
swscale: make rgb24 function macros slightly smaller.

7 years agoAdd some missing v4l2 pix_fmt mappings.
Carl Eugen Hoyos [Wed, 1 Feb 2012 17:04:17 +0000 (18:04 +0100)]
Add some missing v4l2 pix_fmt mappings.

7 years agoFix v4l pix_fmt mapping for rgb32: There is no transparency information.
Carl Eugen Hoyos [Wed, 1 Feb 2012 17:00:24 +0000 (18:00 +0100)]
Fix v4l pix_fmt mapping for rgb32: There is no transparency information.

7 years agoFix pix_fmt mapping for v4l2 rgb5x5.
Carl Eugen Hoyos [Wed, 1 Feb 2012 16:58:42 +0000 (17:58 +0100)]
Fix pix_fmt mapping for v4l2 rgb5x5.

7 years agoavcodec.h: Remove some disabled cruft.
Diego Biurrun [Wed, 1 Feb 2012 13:58:10 +0000 (14:58 +0100)]
avcodec.h: Remove some disabled cruft.

7 years agoswscale: remove obsolete comment.
Ronald S. Bultje [Wed, 1 Feb 2012 04:35:58 +0000 (20:35 -0800)]
swscale: remove obsolete comment.

7 years agoSupport decoding rgba64 with libopenjpeg.
Michael Bradshaw [Wed, 1 Feb 2012 14:51:18 +0000 (15:51 +0100)]
Support decoding rgba64 with libopenjpeg.

7 years agoSupport decoding gray8a with libopenjpeg.
Michael Bradshaw [Wed, 1 Feb 2012 14:47:28 +0000 (15:47 +0100)]
Support decoding gray8a with libopenjpeg.

7 years agoswscale-test: Drop unused argc and argv arguments from main().
Diego Biurrun [Fri, 13 Jan 2012 16:01:18 +0000 (17:01 +0100)]
swscale-test: Drop unused argc and argv arguments from main().

7 years agozmbv: Employ more meaningful return values.
Paul B Mahol [Wed, 1 Feb 2012 00:35:29 +0000 (00:35 +0000)]
zmbv: Employ more meaningful return values.

Also use av_log_ask_for_sample() where it makes sense.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agozmbvenc: Employ more meaningful return values.
Paul B Mahol [Tue, 31 Jan 2012 23:59:10 +0000 (23:59 +0000)]
zmbvenc: Employ more meaningful return values.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agovc1: prevent null pointer dereference on broken files
Janne Grunau [Wed, 25 Jan 2012 14:49:54 +0000 (15:49 +0100)]
vc1: prevent null pointer dereference on broken files

CC: libav-stable@libav.org
7 years agozmbv: check av_realloc() return values and avoid memleaks on ENOMEM
Janne Grunau [Wed, 1 Feb 2012 00:00:17 +0000 (01:00 +0100)]
zmbv: check av_realloc() return values and avoid memleaks on ENOMEM

7 years agotruespeech: align buffer
Paul B Mahol [Wed, 1 Feb 2012 05:30:18 +0000 (05:30 +0000)]
truespeech: align buffer

DSPContext.bswap_buf() requires aligned output

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
7 years agolibavformat/avformat.h: fix stray libavformat reference
Michael Niedermayer [Wed, 1 Feb 2012 03:41:07 +0000 (04:41 +0100)]
libavformat/avformat.h: fix stray libavformat reference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolibavfilter/version.h: fix project name
Michael Niedermayer [Wed, 1 Feb 2012 03:38:41 +0000 (04:38 +0100)]
libavfilter/version.h: fix project name

The code in the file is written by vitor in be19d752 (2008)
thus cannot have originated in libav which did not exist at that
time

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosnowdata: Fix project name, this file has not been developed in libav
Michael Niedermayer [Wed, 1 Feb 2012 03:32:04 +0000 (04:32 +0100)]
snowdata: Fix project name, this file has not been developed in libav
or by any libav developers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agogsm.h: Fix project reference
Michael Niedermayer [Wed, 1 Feb 2012 03:27:40 +0000 (04:27 +0100)]
gsm.h: Fix project reference

The code in this file is copy and pasted from FFmpegs libavcodec/libgsm.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowestwood_aud: Fix project reference
Michael Niedermayer [Wed, 1 Feb 2012 03:19:09 +0000 (04:19 +0100)]
westwood_aud: Fix project reference

"Copyright (c) 2003 The ffmpeg Project" and "part of libav"
is ROTFL

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosimpleidct: fix project name.
Michael Niedermayer [Wed, 1 Feb 2012 03:15:35 +0000 (04:15 +0100)]
simpleidct: fix project name.

"Copyright (c) 2001 Michael Niedermayer" and "part of Libav" is not likely
not only am i not a libav developer there also was no libav in 2001

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoaacenc: fix library references
Michael Niedermayer [Wed, 1 Feb 2012 02:46:11 +0000 (03:46 +0100)]
aacenc: fix library references

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc: fix convertion tool references
Michael Niedermayer [Wed, 1 Feb 2012 02:37:08 +0000 (03:37 +0100)]
doc: fix convertion tool references

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264 golomb: Fix copyright violation.
Michael Niedermayer [Wed, 1 Feb 2012 02:05:39 +0000 (03:05 +0100)]
h264 golomb: Fix copyright violation.

Copy and paste does not change authorship
See 0da71265 for the original checkin

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoac3: Do not read past the end of ff_ac3_band_start_tab.
Mans Rullgard [Tue, 31 Jan 2012 18:20:33 +0000 (10:20 -0800)]
ac3: Do not read past the end of ff_ac3_band_start_tab.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Alex Converse <alex.converse@gmail.com>
7 years agodv: Fix small stack overread related to CVE-2011-3929 and CVE-2011-3936.
Alex Converse [Thu, 26 Jan 2012 23:08:26 +0000 (15:08 -0800)]
dv: Fix small stack overread related to CVE-2011-3929 and CVE-2011-3936.

Found with asan.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Alex Converse <alex.converse@gmail.com>
7 years agodv: Fix null pointer dereference due to ach=0
Michael Niedermayer [Tue, 24 Jan 2012 16:51:40 +0000 (17:51 +0100)]
dv: Fix null pointer dereference due to ach=0

dv: Fix null pointer dereference due to ach=0

Fixes part2 of CVE-2011-3929

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Reviewed-by: Roman Shaposhnik <roman@shaposhnik.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Alex Converse <alex.converse@gmail.com>
7 years agodv: check stype
Michael Niedermayer [Tue, 24 Jan 2012 16:48:23 +0000 (17:48 +0100)]
dv: check stype

dv: check stype

Fixes part1 of CVE-2011-3929
Possibly fixes part of CVE-2011-3936

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Reviewed-by: Roman Shaposhnik <roman@shaposhnik.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Alex Converse <alex.converse@gmail.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 1 Feb 2012 01:08:23 +0000 (02:08 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (29 commits)
  fate: add golomb-test
  golomb-test: K&R formatting cosmetics
  h264: Split h264-test off into a separate file - golomb-test.c.
  h264-test: cleanup: drop timer invocations, commented out code and other cruft
  h264-test: Remove unused DSP and AVCodec contexts and related init calls.
  adpcm: Add missing stdint.h #include to fix standalone header compilation.
  lavf: add functions for accessing the fourcc<->CodecID mapping tables.
  lavc: set AVCodecContext.codec in avcodec_get_context_defaults3().
  lavc: make avcodec_close() work properly on unopened codecs.
  lavc: add avcodec_is_open().
  lavf: rename AVInputFormat.value to raw_codec_id.
  lavf: remove the pointless value field from flv and iv8
  lavc/lavf: remove unnecessary symbols from the symbol version script.
  lavc: reorder AVCodec fields.
  lavf: reorder AVInput/OutputFormat fields.
  mp3dec: Fix a heap-buffer-overflow
  adpcmenc: remove some unneeded casts
  adpcmenc: use int16_t and uint8_t instead of short and unsigned char.
  adpcmenc: fix adpcm_ms extradata allocation
  adpcmenc: return proper AVERROR codes instead of -1
  ...

Conflicts:
doc/APIchanges
libavcodec/Makefile
libavcodec/adpcmenc.c
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/libavcodec.v
libavcodec/mpc7.c
libavcodec/mpegaudiodec.c
libavcodec/options.c
libavformat/Makefile
libavformat/avformat.h
libavformat/flvdec.c
libavformat/libavformat.v

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate-golomb: extend golomb-test to get_ue_golomb_long()
Janne Grunau [Tue, 31 Jan 2012 20:39:48 +0000 (21:39 +0100)]
fate-golomb: extend golomb-test to get_ue_golomb_long()

get_ue_golomb_long() is only tested for values up to 2^15 - 2 since
we can not write larger values.
Silence the test on success and return a non-zero value on error.
Use an heap scratch buffer instead of large stack buffer.
Remove unneeded includes.

7 years agoswfdec: Simplify sample rate calculation.
Alex Converse [Tue, 31 Jan 2012 17:55:06 +0000 (09:55 -0800)]
swfdec: Simplify sample rate calculation.

7 years agoffv1dec: use correct linesize
Paul B Mahol [Tue, 31 Jan 2012 21:41:33 +0000 (21:41 +0000)]
ffv1dec: use correct linesize

Apparently this did not break anything.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'shariman/wmall'
Michael Niedermayer [Tue, 31 Jan 2012 21:55:03 +0000 (22:55 +0100)]
Merge remote-tracking branch 'shariman/wmall'

* shariman/wmall:
  Cosmetics: Fix some whitespace errors and indentation
  Use correct variable type for 32-bit samples buffer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1dec: PIX_FMT_YUVA444P support
Paul B Mahol [Tue, 31 Jan 2012 20:18:24 +0000 (20:18 +0000)]
ffv1dec: PIX_FMT_YUVA444P support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1enc: PIX_FMT_YUVA444P support
Paul B Mahol [Tue, 31 Jan 2012 20:21:34 +0000 (20:21 +0000)]
ffv1enc: PIX_FMT_YUVA444P support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1dec: PIX_FMT_YUVA420P support
Paul B Mahol [Tue, 31 Jan 2012 20:18:22 +0000 (20:18 +0000)]
ffv1dec: PIX_FMT_YUVA420P support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1enc: PIX_FMT_YUVA420P support
Paul B Mahol [Tue, 31 Jan 2012 20:18:21 +0000 (20:18 +0000)]
ffv1enc: PIX_FMT_YUVA420P support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompeg/h264: update thread context even if it is not initialized.
Michael Niedermayer [Sun, 29 Jan 2012 21:37:37 +0000 (22:37 +0100)]
mpeg/h264: update thread context even if it is not initialized.

Fixes decoding of Ticket952

Tested-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: Return the correct number of bytes for mid strea, extradata.
Michael Niedermayer [Sun, 29 Jan 2012 20:06:09 +0000 (21:06 +0100)]
h264: Return the correct number of bytes for mid strea, extradata.

Fixes the hang with Ticket952

Tested-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopngdec: fix warning about pointer types
Michael Niedermayer [Tue, 31 Jan 2012 02:57:23 +0000 (03:57 +0100)]
pngdec: fix warning about pointer types

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: add golomb-test
Diego Biurrun [Mon, 30 Jan 2012 11:58:20 +0000 (12:58 +0100)]
fate: add golomb-test

7 years agogolomb-test: K&R formatting cosmetics
Diego Biurrun [Mon, 30 Jan 2012 10:30:13 +0000 (11:30 +0100)]
golomb-test: K&R formatting cosmetics

7 years agoh264: Split h264-test off into a separate file - golomb-test.c.
Diego Biurrun [Mon, 30 Jan 2012 11:50:16 +0000 (12:50 +0100)]
h264: Split h264-test off into a separate file - golomb-test.c.

The new name is more appropriate as only golomb functions are tested.

7 years agoh264-test: cleanup: drop timer invocations, commented out code and other cruft
Diego Biurrun [Mon, 30 Jan 2012 10:16:20 +0000 (11:16 +0100)]
h264-test: cleanup: drop timer invocations, commented out code and other cruft

7 years agoh264-test: Remove unused DSP and AVCodec contexts and related init calls.
Diego Biurrun [Mon, 30 Jan 2012 10:10:27 +0000 (11:10 +0100)]
h264-test: Remove unused DSP and AVCodec contexts and related init calls.

This also avoids a segfault on startup.

7 years agoadpcm: Add missing stdint.h #include to fix standalone header compilation.
Diego Biurrun [Tue, 31 Jan 2012 17:41:52 +0000 (18:41 +0100)]
adpcm: Add missing stdint.h #include to fix standalone header compilation.

7 years agoffmpeg: fix -map_channel being ignored when resampling is not needed.
Clément Bœsch [Tue, 31 Jan 2012 14:51:01 +0000 (15:51 +0100)]
ffmpeg: fix -map_channel being ignored when resampling is not needed.

7 years agolavf: add functions for accessing the fourcc<->CodecID mapping tables.
Anton Khirnov [Fri, 27 Jan 2012 12:33:09 +0000 (13:33 +0100)]
lavf: add functions for accessing the fourcc<->CodecID mapping tables.

Fixes bug 212.

7 years agolavc: set AVCodecContext.codec in avcodec_get_context_defaults3().
Anton Khirnov [Sat, 28 Jan 2012 18:15:15 +0000 (19:15 +0100)]
lavc: set AVCodecContext.codec in avcodec_get_context_defaults3().

This way, if the AVCodecContext is allocated for a specific codec, the
caller doesn't need to store this codec separately and then pass it
again to avcodec_open2().

It also allows to set codec private options using av_opt_set_* before
opening the codec.

7 years agolavc: make avcodec_close() work properly on unopened codecs.
Anton Khirnov [Sun, 29 Jan 2012 11:17:30 +0000 (12:17 +0100)]
lavc: make avcodec_close() work properly on unopened codecs.

I.e. free the priv_data and other stuff allocated in
avcodec_alloc_context3() and not segfault.

7 years agolavc: add avcodec_is_open().
Anton Khirnov [Thu, 8 Dec 2011 05:57:44 +0000 (06:57 +0100)]
lavc: add avcodec_is_open().

It allows to check whether an AVCodecContext is open in a documented
way. Right now the undocumented way this check is done in lavf/lavc is
by checking whether AVCodecContext.codec is NULL. However it's desirable
to be able to set AVCodecContext.codec before avcodec_open2().

7 years agolavf: rename AVInputFormat.value to raw_codec_id.
Anton Khirnov [Tue, 31 Jan 2012 06:50:31 +0000 (07:50 +0100)]
lavf: rename AVInputFormat.value to raw_codec_id.

It's only used by raw demuxers for storing the codec id.

7 years agolavf: remove the pointless value field from flv and iv8
Anton Khirnov [Tue, 31 Jan 2012 06:46:18 +0000 (07:46 +0100)]
lavf: remove the pointless value field from flv and iv8

The demuxers don't use it in any way.

7 years agolavc/lavf: remove unnecessary symbols from the symbol version script.
Anton Khirnov [Sun, 29 Jan 2012 11:22:49 +0000 (12:22 +0100)]
lavc/lavf: remove unnecessary symbols from the symbol version script.

7 years agolavc: reorder AVCodec fields.
Anton Khirnov [Fri, 27 Jan 2012 11:29:37 +0000 (12:29 +0100)]
lavc: reorder AVCodec fields.

Put all private fields at the end and mark them as such so they can be
easily changed/removed.

This breaks ABI.

7 years agolavf: reorder AVInput/OutputFormat fields.
Anton Khirnov [Fri, 27 Jan 2012 11:29:37 +0000 (12:29 +0100)]
lavf: reorder AVInput/OutputFormat fields.

Put all private fields at the end and mark them as such so they can be
easily changed/removed.

This breaks ABI.

7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 31 Jan 2012 00:14:58 +0000 (01:14 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (26 commits)
  avconv: deprecate the -deinterlace option
  doc: Fix the name of the new function
  aacenc: make sure to encode enough frames to cover all input samples.
  aacenc: only use the number of input samples provided by the user.
  wmadec: Verify bitstream size makes sense before calling init_get_bits.
  kmvc: Log into a context at a log level constant.
  mpeg12: Pad framerate tab to 16 entries.
  kgv1dec: Increase offsets array size so it is large enough.
  kmvc: Check palsize.
  nsvdec: Propagate errors
  nsvdec: Be more careful with av_malloc().
  nsvdec: Fix use of uninitialized streams.
  movenc: cosmetics: Get rid of camelCase identifiers
  swscale: more generic check for planar destination formats with alpha
  doc: Document mov/mp4 fragmentation options
  build: Use order-only prerequisites for creating FATE reference file dirs.
  x86 dsputil: provide SSE2/SSSE3 versions of bswap_buf
  rtsp: Remove some unused variables from ff_rtsp_connect().
  avutil: make intfloat api public
  avformat_write_header(): detail error message
  ...

Conflicts:
doc/APIchanges
doc/ffmpeg.texi
doc/muxers.texi
ffmpeg.c
libavcodec/kmvc.c
libavcodec/x86/Makefile
libavcodec/x86/dsputil_yasm.asm
libavcodec/x86/pngdsp-init.c
libavformat/movenc.c
libavformat/movenc.h
libavformat/mpegtsenc.c
libavformat/nsvdec.c
libavformat/utils.c
libavutil/avutil.h
libswscale/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomp3dec: Fix a heap-buffer-overflow
Alex Converse [Wed, 25 Jan 2012 23:46:14 +0000 (15:46 -0800)]
mp3dec: Fix a heap-buffer-overflow

In some cases, what is left to read from ptr is smaller than EXTRABYTES.

Based on a patch by Thierry Foucu <tfoucu@gmail.com>.

Signed-off-by: Alex Converse <alex.converse@gmail.com>
7 years agoadpcmenc: remove some unneeded casts
Justin Ruggles [Mon, 30 Jan 2012 18:34:43 +0000 (13:34 -0500)]
adpcmenc: remove some unneeded casts

7 years agoadpcmenc: use int16_t and uint8_t instead of short and unsigned char.
Justin Ruggles [Mon, 30 Jan 2012 18:33:05 +0000 (13:33 -0500)]
adpcmenc: use int16_t and uint8_t instead of short and unsigned char.

7 years agoadpcmenc: fix adpcm_ms extradata allocation
Justin Ruggles [Mon, 30 Jan 2012 18:15:18 +0000 (13:15 -0500)]
adpcmenc: fix adpcm_ms extradata allocation

Add FF_INPUT_BUFFER_PADDING_SIZE.
If allocation fails, also free memory which was allocated previously in
adpcm_encode_init().

7 years agoadpcmenc: return proper AVERROR codes instead of -1
Justin Ruggles [Mon, 30 Jan 2012 18:06:57 +0000 (13:06 -0500)]
adpcmenc: return proper AVERROR codes instead of -1

7 years agoadpcmenc: check for coded_frame allocation failure
Justin Ruggles [Mon, 30 Jan 2012 18:03:01 +0000 (13:03 -0500)]
adpcmenc: check for coded_frame allocation failure

7 years agoadpcmenc: Do not set coded_frame->key_frame.
Justin Ruggles [Mon, 30 Jan 2012 17:57:34 +0000 (12:57 -0500)]
adpcmenc: Do not set coded_frame->key_frame.

It is already set in avcodec_alloc_frame().

7 years agompc7: check for allocation failure
Justin Ruggles [Mon, 30 Jan 2012 19:33:01 +0000 (14:33 -0500)]
mpc7: check for allocation failure

7 years agompc7: align local temp buffer
Justin Ruggles [Mon, 30 Jan 2012 19:29:05 +0000 (14:29 -0500)]
mpc7: align local temp buffer

DSPContext.bswap_buf() requires aligned output