ffmpeg.git
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 20 Jul 2011 16:20:05 +0000 (18:20 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Remove h264_lowres_idct_put/add functions
  Remove snow/dwt test program
  h264: remove some disabled code
  Fix incorrect max_lowres values
  matroskadec: fix integer underflow if header length < probe length.
  cosmetics: indentation
  eac3enc: use frame exponent strategy when applicable.
  cosmetics: rename eac3dec_data.c/h to eac3_data.c/h since the tables will also be used in the E-AC-3 encoder.
  dsputil: fix ff_check_alignment()

Conflicts:
libavcodec/Makefile
libavcodec/h264idct_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRemove h264_lowres_idct_put/add functions
Mans Rullgard [Wed, 20 Jul 2011 08:46:18 +0000 (09:46 +0100)]
Remove h264_lowres_idct_put/add functions

Use of these has been broken ever since the h264 idct was changed
to always use transposed inputs.  Furthermore, they were only
ever used if some *other* non-default idct was requested.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoRemove snow/dwt test program
Mans Rullgard [Sun, 17 Jul 2011 19:43:15 +0000 (20:43 +0100)]
Remove snow/dwt test program

This test program so full of programming errors it is impossible
to make sense of it.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoh264: remove some disabled code
Diego Biurrun [Sun, 17 Jul 2011 11:09:04 +0000 (13:09 +0200)]
h264: remove some disabled code

8 years agoFix incorrect max_lowres values
Mans Rullgard [Wed, 20 Jul 2011 08:55:48 +0000 (09:55 +0100)]
Fix incorrect max_lowres values

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agomatroskadec: fix integer underflow if header length < probe length.
Chris Evans [Wed, 20 Jul 2011 00:51:48 +0000 (17:51 -0700)]
matroskadec: fix integer underflow if header length < probe length.

This fixes a crash with specifically crafted files.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agolibx264.c: distinguish between x264 parameter errors.
Erik Slagter [Mon, 18 Jul 2011 18:04:15 +0000 (20:04 +0200)]
libx264.c: distinguish between x264 parameter errors.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agocosmetics: indentation
Justin Ruggles [Wed, 13 Jul 2011 16:49:15 +0000 (12:49 -0400)]
cosmetics: indentation

8 years agoeac3enc: use frame exponent strategy when applicable.
Justin Ruggles [Wed, 13 Jul 2011 16:20:29 +0000 (12:20 -0400)]
eac3enc: use frame exponent strategy when applicable.

This checks if the set of selected exponent strategies for all blocks in a
channel are in the frame exponent strategy table, and if so, writes the
table index instead of each strategy. This saves up to 7 bits per channel per
frame, so the overall effect on quality is small.

8 years agocosmetics: rename eac3dec_data.c/h to eac3_data.c/h since the tables will also
Justin Ruggles [Tue, 12 Jul 2011 20:44:22 +0000 (16:44 -0400)]
cosmetics: rename eac3dec_data.c/h to eac3_data.c/h since the tables will also
be used in the E-AC-3 encoder.

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 19 Jul 2011 16:45:47 +0000 (18:45 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  simple_idct: simplify some ifdeffery
  simple_idct: remove code for DCTELEM != int16
  Remove VLAs in ff_amrwb_lsp2lpc()
  fate: make vsynth tests depend on only the relevant vref
  rtsp: remove disabled code
  dsputil: restore mistakenly removed hunk of disabled code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodsputil: fix ff_check_alignment()
Mans Rullgard [Tue, 19 Jul 2011 09:20:56 +0000 (10:20 +0100)]
dsputil: fix ff_check_alignment()

The change to LOCAL_ALIGNED means the declared object must be an
array and the subsequent test should not use the & operator.

Noticed by Uoti Urpala.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoDo not use AVFMT_FLAG_NONBLOCK for the output file.
Nicolas George [Sat, 16 Jul 2011 08:09:17 +0000 (10:09 +0200)]
Do not use AVFMT_FLAG_NONBLOCK for the output file.

Restore the commit 0de8ebf by Carl Eugen Hoyos that was lost during the
merge 58257ea.

8 years agosimple_idct: simplify some ifdeffery
Mans Rullgard [Mon, 18 Jul 2011 15:04:25 +0000 (16:04 +0100)]
simple_idct: simplify some ifdeffery

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agosimple_idct: remove code for DCTELEM != int16
Mans Rullgard [Mon, 18 Jul 2011 14:23:22 +0000 (15:23 +0100)]
simple_idct: remove code for DCTELEM != int16

DCTELEM can never be changed to anything else, too much code
depends on it.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoBink: clip AC coefficients during dequantization.
Reimar Döffinger [Sun, 17 Jul 2011 11:03:57 +0000 (13:03 +0200)]
Bink: clip AC coefficients during dequantization.

Fixes artefacts with Neverwinter Nights WOTCLogo.bik
(http://drmccoy.de/zeugs/WOTCLogo.bik).
Fixes trac ticket #352.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoRemove a pointless/bad "static".
Reimar Döffinger [Mon, 18 Jul 2011 17:53:36 +0000 (19:53 +0200)]
Remove a pointless/bad "static".

It has no advantage and seems to cause compile issues with
some combinations of compiler/compiler flags/PIC.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoRemove VLAs in ff_amrwb_lsp2lpc()
Mans Rullgard [Sun, 17 Jul 2011 10:24:34 +0000 (11:24 +0100)]
Remove VLAs in ff_amrwb_lsp2lpc()

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agofate: make vsynth tests depend on only the relevant vref
Mans Rullgard [Sun, 17 Jul 2011 18:47:58 +0000 (19:47 +0100)]
fate: make vsynth tests depend on only the relevant vref

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agortsp: remove disabled code
Diego Biurrun [Sun, 17 Jul 2011 11:27:27 +0000 (13:27 +0200)]
rtsp: remove disabled code

8 years agodsputil: restore mistakenly removed hunk of disabled code
Diego Biurrun [Mon, 18 Jul 2011 16:03:28 +0000 (18:03 +0200)]
dsputil: restore mistakenly removed hunk of disabled code

This particular part serves to document the optimized code variant.

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 18 Jul 2011 14:43:35 +0000 (16:43 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h
  dsputil: remove disabled code
  tta: remove disabled code
  gxfenc: place variable declarations before statements
  x86: Use LOCAL_ALIGNED in mpegvideo_mmx_template
  random_seed: use proper #includes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoau: add computation for duration
ami_stuff [Mon, 18 Jul 2011 11:59:30 +0000 (13:59 +0200)]
au: add computation for duration

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agovf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h
Stefano Sabatini [Fri, 15 Jul 2011 13:40:31 +0000 (15:40 +0200)]
vf_libopencv: replace opencv/cxtypes.h #include by opencv/cxcore.h

cxtypes.h works with version 2.1 and older, cxcore.h works with 2.2 and older.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agodsputil: remove disabled code
Diego Biurrun [Sun, 17 Jul 2011 11:29:13 +0000 (13:29 +0200)]
dsputil: remove disabled code

8 years agotta: remove disabled code
Diego Biurrun [Sun, 17 Jul 2011 11:26:53 +0000 (13:26 +0200)]
tta: remove disabled code

8 years agogxfenc: place variable declarations before statements
Diego Biurrun [Sun, 17 Jul 2011 21:51:10 +0000 (23:51 +0200)]
gxfenc: place variable declarations before statements

libavformat/gxfenc.c:409: warning: ISO C90 forbids mixed declarations and code

8 years agox86: Use LOCAL_ALIGNED in mpegvideo_mmx_template
Martin Storsjö [Sun, 17 Jul 2011 15:43:11 +0000 (18:43 +0300)]
x86: Use LOCAL_ALIGNED in mpegvideo_mmx_template

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agorandom_seed: use proper #includes
Mans Rullgard [Sun, 17 Jul 2011 13:17:10 +0000 (14:17 +0100)]
random_seed: use proper #includes

Use <> for system headers, add needed math.h, drop unnecessary avutil.h.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 17 Jul 2011 17:52:05 +0000 (19:52 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  ffmpeg: fix some indentation
  ffmpeg: fix operation with --disable-avfilter
  simple_idct: remove disabled code
  motion_est: remove disabled code
  vc1: remove disabled code
  fate: separate lavf-mxf_d10 test from lavf-mxf
  cabac: Move code only used in the cabac test program to cabac.c.
  ffplay: warn that -pix_fmt is no longer working, suggest alternative
  ffplay: warn that -s is no longer working, suggest alternative
  lavf: rename enc variable in utils.c:has_codec_parameters()
  lavf: use designated initialisers for all (de)muxers.
  wav: remove a use of deprecated AV_METADATA_ macro
  rmdec: remove useless ap parameter from rm_read_header_old()
  dct-test: remove write-only variable
  des: fix #if conditional around P_shuffle
  Use LOCAL_ALIGNED in ff_check_alignment()

Conflicts:
ffmpeg.c
libavformat/avidec.c
libavformat/matroskaenc.c
libavformat/mp3enc.c
libavformat/oggenc.c
libavformat/utils.c
tests/ref/lavf/mxf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: fix some indentation
Mans Rullgard [Sun, 17 Jul 2011 14:27:41 +0000 (15:27 +0100)]
ffmpeg: fix some indentation

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoffmpeg: fix operation with --disable-avfilter
Mans Rullgard [Sun, 17 Jul 2011 14:27:14 +0000 (15:27 +0100)]
ffmpeg: fix operation with --disable-avfilter

The width and height must be copied from the input before
being used.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agosimple_idct: remove disabled code
Diego Biurrun [Sun, 17 Jul 2011 11:30:00 +0000 (13:30 +0200)]
simple_idct: remove disabled code

8 years agomotion_est: remove disabled code
Diego Biurrun [Sun, 17 Jul 2011 11:28:11 +0000 (13:28 +0200)]
motion_est: remove disabled code

8 years agovc1: remove disabled code
Diego Biurrun [Sun, 17 Jul 2011 11:35:21 +0000 (13:35 +0200)]
vc1: remove disabled code

8 years agofate: separate lavf-mxf_d10 test from lavf-mxf
Mans Rullgard [Sun, 17 Jul 2011 14:40:05 +0000 (15:40 +0100)]
fate: separate lavf-mxf_d10 test from lavf-mxf

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoRevert "Do not decode RV30 files if the extradata is too small"
Michael Niedermayer [Sun, 17 Jul 2011 12:05:03 +0000 (14:05 +0200)]
Revert "Do not decode RV30 files if the extradata is too small"

This commit is plain wrong, theres no reason to error out at this point nor is the
error value guranteed to be negative as it should be

This reverts commit 289c60001fb0a9a1d7a97c876d8a42b84c6874ac.

8 years agocabac: Move code only used in the cabac test program to cabac.c.
Diego Biurrun [Thu, 7 Jul 2011 21:16:56 +0000 (23:16 +0200)]
cabac: Move code only used in the cabac test program to cabac.c.

8 years agoffplay: warn that -pix_fmt is no longer working, suggest alternative
Stefano Sabatini [Sat, 16 Jul 2011 20:43:11 +0000 (22:43 +0200)]
ffplay: warn that -pix_fmt is no longer working, suggest alternative

Also remove now unused variable.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoffplay: warn that -s is no longer working, suggest alternative
Stefano Sabatini [Sat, 16 Jul 2011 21:08:06 +0000 (23:08 +0200)]
ffplay: warn that -s is no longer working, suggest alternative

Also remove now unused variables.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agolavf: rename enc variable in utils.c:has_codec_parameters()
Stefano Sabatini [Sat, 16 Jul 2011 21:08:29 +0000 (23:08 +0200)]
lavf: rename enc variable in utils.c:has_codec_parameters()

Rename it to "avctx", the old name was confusing as the function is
used also with decoder contexts.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agolavf: use designated initialisers for all (de)muxers.
Anton Khirnov [Sat, 16 Jul 2011 20:18:12 +0000 (22:18 +0200)]
lavf: use designated initialisers for all (de)muxers.

It's more readable and less prone to breakage.

8 years agowav: remove a use of deprecated AV_METADATA_ macro
Anton Khirnov [Sat, 16 Jul 2011 07:53:40 +0000 (09:53 +0200)]
wav: remove a use of deprecated AV_METADATA_ macro

8 years agormdec: remove useless ap parameter from rm_read_header_old()
Anton Khirnov [Sat, 16 Jul 2011 07:43:33 +0000 (09:43 +0200)]
rmdec: remove useless ap parameter from rm_read_header_old()

8 years agodct-test: remove write-only variable
Mans Rullgard [Sat, 16 Jul 2011 18:23:07 +0000 (19:23 +0100)]
dct-test: remove write-only variable

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agodes: fix #if conditional around P_shuffle
Mans Rullgard [Sat, 16 Jul 2011 18:10:43 +0000 (19:10 +0100)]
des: fix #if conditional around P_shuffle

CONFIG_SMALL is always defined as 0 or 1.

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoUse LOCAL_ALIGNED in ff_check_alignment()
Mans Rullgard [Sat, 16 Jul 2011 14:37:05 +0000 (15:37 +0100)]
Use LOCAL_ALIGNED in ff_check_alignment()

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 16 Jul 2011 17:40:35 +0000 (19:40 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (22 commits)
  arm: remove disabled function dct_unquantize_h263_inter_iwmmxt()
  Remove commented-out call to non-existing function print_pow1().
  Do not decode RV30 files if the extradata is too small
  flashsv: split flashsv_decode_block() off from flashsv_decode_frame().
  ppc: remove disabled code
  libspeexdec: Drop const qualifier to silence compiler warning.
  libopenjpeg: Drop const qualifier to silence compiler warning.
  alac: Remove unused dummy code.
  Remove unused structs and tables.
  vaapi: do not assert on value read from input bitstream
  flashsvenc: replace bitstream description by a link to the specification
  flashsvenc: drop unnecessary cast
  flashsvenc: improve some variable names and fix corresponding comments
  flashsvenc: merge two consecutive if-conditions
  flashsvenc: merge variable declarations and initializations
  flashsvenc: convert some debug av_log() to av_dlog()
  flashsvenc: whitespace cosmetics
  flashsvenc: drop some unnecessary parentheses
  flashsvenc: fix some comment typos
  aacps: skip some memcpy() if src and dst would be equal
  ...

Conflicts:
libavcodec/vaapi_mpeg2.c
libavformat/aviobuf.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoRevert "ffmpeg: get rid of a pointless limit on number of streams."
Michael Niedermayer [Sat, 16 Jul 2011 17:24:10 +0000 (19:24 +0200)]
Revert "ffmpeg: get rid of a pointless limit on number of streams."

This reverts commit c7dd3e7e43555b2922481a9242a306c5b138d69c

Conflicts:

ffmpeg.c

8 years agolavfi: add audio channel packing negotiation fields
Mina Nagy Zaki [Tue, 28 Jun 2011 05:56:19 +0000 (08:56 +0300)]
lavfi: add audio channel packing negotiation fields

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agoarm: remove disabled function dct_unquantize_h263_inter_iwmmxt()
Diego Biurrun [Sat, 16 Jul 2011 17:15:01 +0000 (19:15 +0200)]
arm: remove disabled function dct_unquantize_h263_inter_iwmmxt()

8 years agoRemove commented-out call to non-existing function print_pow1().
Diego Biurrun [Tue, 26 Apr 2011 14:57:55 +0000 (16:57 +0200)]
Remove commented-out call to non-existing function print_pow1().

8 years agompegvideo: fix compilation after 900321b08c95bd42e6db53864bfffbe48d6019da
Stefano Sabatini [Sat, 16 Jul 2011 16:49:39 +0000 (18:49 +0200)]
mpegvideo: fix compilation after 900321b08c95bd42e6db53864bfffbe48d6019da

Replace:
s->last_picture_ptr->f.key_frame = 0;
with:
s->last_picture_ptr->key_frame = 0;

This is required since mpegvideo.h:Picture now contains an embedded
AVFrame f, rather than a literal copy of the AVFrame fields.

8 years agoDo not decode RV30 files if the extradata is too small
Rafaël Carré [Sat, 16 Jul 2011 15:41:08 +0000 (11:41 -0400)]
Do not decode RV30 files if the extradata is too small

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoDon't mark generated dummy frame output from mpeg1/2 decoder as keyframe.
elupus [Fri, 22 Apr 2011 13:42:51 +0000 (15:42 +0200)]
Don't mark generated dummy frame output from mpeg1/2 decoder as keyframe.

We use this flag to tell when to assume decoded data is free
from artifacts after a seek. The mpeg1/2 decoder will generate
a dummy frame if decoding is started on a non keyframe. This
will sadly be output from decoder to player and displayed
as a gray screen.

8 years agoPatch for memory leaks in DVB subtitles decoder
Jernej Fijačko [Mon, 11 Jul 2011 08:11:04 +0000 (10:11 +0200)]
Patch for memory leaks in DVB subtitles decoder

Signed-off-by: Joakim Plate <elupus@ecce.se>
8 years agoflashsv: split flashsv_decode_block() off from flashsv_decode_frame().
Diego Biurrun [Wed, 6 Jul 2011 21:53:32 +0000 (23:53 +0200)]
flashsv: split flashsv_decode_block() off from flashsv_decode_frame().

8 years agoppc: remove disabled code
Diego Biurrun [Fri, 15 Jul 2011 23:35:01 +0000 (01:35 +0200)]
ppc: remove disabled code

8 years agolibspeexdec: Drop const qualifier to silence compiler warning.
Diego Biurrun [Wed, 6 Jul 2011 23:31:03 +0000 (01:31 +0200)]
libspeexdec: Drop const qualifier to silence compiler warning.

libavcodec/libspeexdec.c:108: warning: passing argument 2 of ‘speex_bits_read_from’ discards qualifiers from pointer target type
/usr/include/speex/speex_bits.h:80: note: expected ‘char *’ but argument is of type ‘const uint8_t *’

8 years agolibopenjpeg: Drop const qualifier to silence compiler warning.
Diego Biurrun [Wed, 6 Jul 2011 23:31:02 +0000 (01:31 +0200)]
libopenjpeg: Drop const qualifier to silence compiler warning.

libavcodec/libopenjpeg.c:100: warning: passing argument 2 of ‘opj_cio_open’ discards qualifiers from pointer target type
/usr/include/openjpeg.h:770: note: expected ‘unsigned char *’ but argument is of type ‘const uint8_t *’

8 years agoalac: Remove unused dummy code.
Diego Biurrun [Fri, 29 Apr 2011 17:49:45 +0000 (19:49 +0200)]
alac: Remove unused dummy code.

8 years agoRemove unused structs and tables.
Diego Biurrun [Fri, 29 Apr 2011 17:40:16 +0000 (19:40 +0200)]
Remove unused structs and tables.

8 years agovaapi: do not assert on value read from input bitstream
Diego Biurrun [Thu, 14 Jul 2011 23:06:16 +0000 (01:06 +0200)]
vaapi: do not assert on value read from input bitstream

User-provided data should never trigger an assert; return error instead.
Also fix an instance of get_bits where get_bits_long should have been used.

This eliminates the following warning:
libavcodec/vaapi_mpeg2.c:112:14: warning: variable 'start_code' set but not used

8 years agoflashsvenc: replace bitstream description by a link to the specification
Diego Biurrun [Fri, 15 Jul 2011 17:45:17 +0000 (19:45 +0200)]
flashsvenc: replace bitstream description by a link to the specification

An official specification now exists and it is both more detailed and
easier to understand than the incomplete notes available here.

8 years agoflashsvenc: drop unnecessary cast
Diego Biurrun [Fri, 15 Jul 2011 14:21:20 +0000 (16:21 +0200)]
flashsvenc: drop unnecessary cast

8 years agoflashsvenc: improve some variable names and fix corresponding comments
Diego Biurrun [Fri, 15 Jul 2011 13:55:19 +0000 (15:55 +0200)]
flashsvenc: improve some variable names and fix corresponding comments

8 years agoflashsvenc: merge two consecutive if-conditions
Diego Biurrun [Fri, 15 Jul 2011 13:28:43 +0000 (15:28 +0200)]
flashsvenc: merge two consecutive if-conditions

8 years agoflashsvenc: merge variable declarations and initializations
Diego Biurrun [Fri, 15 Jul 2011 13:28:18 +0000 (15:28 +0200)]
flashsvenc: merge variable declarations and initializations

8 years agoflashsvenc: convert some debug av_log() to av_dlog()
Diego Biurrun [Fri, 15 Jul 2011 13:26:49 +0000 (15:26 +0200)]
flashsvenc: convert some debug av_log() to av_dlog()

8 years agoflashsvenc: whitespace cosmetics
Diego Biurrun [Fri, 15 Jul 2011 13:26:18 +0000 (15:26 +0200)]
flashsvenc: whitespace cosmetics

8 years agoflashsvenc: drop some unnecessary parentheses
Diego Biurrun [Fri, 15 Jul 2011 13:09:39 +0000 (15:09 +0200)]
flashsvenc: drop some unnecessary parentheses

8 years agoflashsvenc: fix some comment typos
Diego Biurrun [Fri, 15 Jul 2011 13:05:51 +0000 (15:05 +0200)]
flashsvenc: fix some comment typos

8 years agoaacps: skip some memcpy() if src and dst would be equal
Mans Rullgard [Fri, 15 Jul 2011 21:38:10 +0000 (22:38 +0100)]
aacps: skip some memcpy() if src and dst would be equal

Signed-off-by: Mans Rullgard <mans@mansr.com>
8 years agolavf/utils: drop av_ prefixes from static functions.
Anton Khirnov [Fri, 15 Jul 2011 18:27:43 +0000 (20:27 +0200)]
lavf/utils: drop av_ prefixes from static functions.

8 years agoavio: don't replicate avio_alloc_context functionality.
Anton Khirnov [Sat, 21 May 2011 17:13:22 +0000 (19:13 +0200)]
avio: don't replicate avio_alloc_context functionality.

8 years agoffmpeg: fix muxer private options (bug introduced by anton khirnov)
Michael Niedermayer [Fri, 15 Jul 2011 16:27:30 +0000 (18:27 +0200)]
ffmpeg: fix muxer private options (bug introduced by anton khirnov)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 15 Jul 2011 15:40:51 +0000 (17:40 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Automatically add more flags required on symbian
  mem.h: switch doxygen parameter order to match function prototype
  doxygen: replace @sa tag by the more readable but equivalent @see
  doxygen: use Doxygen markup for authors and web links where appropriate
  doxygen: do not include license boilerplate in Doxygen documentation
  ac3enc: Mark AVClasses const
  ffserver: Replace two loops with one loop.
  ffmpeg: Fix the check for experimental codecs
  swscale: extend mmx padding.
  swscale: clip unscaled colorspace conversion path.
  doxygen: misc consistency cosmetics
  doc: remove file name from @file directive in Doxygen usage example
  doxygen: consistently place brief description
  doxygen: place empty line between brief description and detailed description
  avformat_open_input(): Add braces to shut up gcc warning.

Conflicts:
libavcodec/8svx.c
libavcodec/tiff.c
libavcodec/tiff.h
libavcodec/vaapi_h264.c
libavcodec/vorbis.c
libavcodec/vorbisdec.c
libavcodec/vp6.c
libswscale/swscale_unscaled.c
libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agowtvdec: also support big-sectors when fat depth is zero
Peter Ross [Fri, 15 Jul 2011 05:59:46 +0000 (15:59 +1000)]
wtvdec: also support big-sectors when fat depth is zero

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoconfigure: Automatically add more flags required on symbian
Martin Storsjö [Fri, 15 Jul 2011 07:53:12 +0000 (10:53 +0300)]
configure: Automatically add more flags required on symbian

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agomem.h: switch doxygen parameter order to match function prototype
Diego Biurrun [Thu, 14 Jul 2011 22:45:59 +0000 (00:45 +0200)]
mem.h: switch doxygen parameter order to match function prototype

8 years agodoxygen: replace @sa tag by the more readable but equivalent @see
Diego Biurrun [Thu, 14 Jul 2011 22:45:23 +0000 (00:45 +0200)]
doxygen: replace @sa tag by the more readable but equivalent @see

8 years agodoxygen: use Doxygen markup for authors and web links where appropriate
Diego Biurrun [Thu, 14 Jul 2011 01:56:07 +0000 (03:56 +0200)]
doxygen: use Doxygen markup for authors and web links where appropriate

8 years agovf_mp: remove rgbtest wrapper
Stefano Sabatini [Thu, 14 Jul 2011 23:29:24 +0000 (01:29 +0200)]
vf_mp: remove rgbtest wrapper

The filter was integrated natively into libavfilter as a source with
name rgbtestsrc.

8 years agolavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs
Stefano Sabatini [Mon, 11 Jul 2011 14:27:09 +0000 (16:27 +0200)]
lavfi: add rgbtestsrc source, ported from MPlayer libmpcodecs

The licence was changed from GPL to LGPL with explicit approval from
the original author.

See thread:
Subject: [FFmpeg-devel] [PATCH] lavfi: add rgbtestsrc source,
        ported from MPlayer libmpcodecs
Date: Mon, 11 Jul 2011 16:32:41 +0200

8 years agovsrc_testsrc: perform some refactoring for simplifying sharing code with another...
Stefano Sabatini [Mon, 11 Jul 2011 14:20:05 +0000 (16:20 +0200)]
vsrc_testsrc: perform some refactoring for simplifying sharing code with another test

In particular creates a special test_init function, which calls a
common init, and introduces a fill_picture_fn which points to the
filling function.

This is required by the pending patch for adding the rgbtestsrc
source.

8 years agovf_mp: remove boxblur wrapper
Stefano Sabatini [Sat, 9 Jul 2011 16:23:02 +0000 (18:23 +0200)]
vf_mp: remove boxblur wrapper

It is natively included in libavfilter.

8 years agodoxygen: do not include license boilerplate in Doxygen documentation
Diego Biurrun [Thu, 14 Jul 2011 01:11:19 +0000 (03:11 +0200)]
doxygen: do not include license boilerplate in Doxygen documentation

8 years agoac3enc: Mark AVClasses const
Martin Storsjö [Thu, 14 Jul 2011 21:21:15 +0000 (00:21 +0300)]
ac3enc: Mark AVClasses const

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoffserver: Replace two loops with one loop.
Mike Williams [Wed, 13 Jul 2011 18:24:47 +0000 (14:24 -0400)]
ffserver: Replace two loops with one loop.

Signed-off-by: Mike Williams <mike@mikebwilliams.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agoffmpeg: Fix the check for experimental codecs
Martin Storsjö [Thu, 14 Jul 2011 20:01:29 +0000 (23:01 +0300)]
ffmpeg: Fix the check for experimental codecs

The variable 'codec' was used uninitialized here.

Signed-off-by: Martin Storsjö <martin@martin.st>
8 years agoswscale: extend mmx padding.
Ronald S. Bultje [Thu, 14 Jul 2011 17:31:27 +0000 (10:31 -0700)]
swscale: extend mmx padding.

Fixes a crash when forcing libc to strictly adhere to malloc sizes.

8 years agoswscale: clip unscaled colorspace conversion path.
Ronald S. Bultje [Thu, 14 Jul 2011 17:24:40 +0000 (10:24 -0700)]
swscale: clip unscaled colorspace conversion path.

Prevents overflows on very bright scenes when adding dither,
which may lead to black dots.

8 years agocmdutils: remove #if 0-ed conflict marger trash that i forgot
Michael Niedermayer [Thu, 14 Jul 2011 19:27:13 +0000 (21:27 +0200)]
cmdutils: remove #if 0-ed conflict marger trash that i forgot

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffmpeg: loose lowres hackery
Michael Niedermayer [Thu, 14 Jul 2011 19:22:12 +0000 (21:22 +0200)]
ffmpeg: loose lowres hackery

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodoxygen: misc consistency cosmetics
Diego Biurrun [Thu, 14 Jul 2011 02:05:17 +0000 (04:05 +0200)]
doxygen: misc consistency cosmetics

8 years agodoc: remove file name from @file directive in Doxygen usage example
Diego Biurrun [Thu, 14 Jul 2011 01:54:10 +0000 (03:54 +0200)]
doc: remove file name from @file directive in Doxygen usage example

The file name is redundant and brittle across file renamings.

8 years agodoxygen: consistently place brief description
Diego Biurrun [Thu, 14 Jul 2011 01:46:19 +0000 (03:46 +0200)]
doxygen: consistently place brief description

8 years agodoxygen: place empty line between brief description and detailed description
Diego Biurrun [Thu, 14 Jul 2011 01:12:36 +0000 (03:12 +0200)]
doxygen: place empty line between brief description and detailed description

Without it, Doxygen cannot separate them into different sections.

8 years agoavformat_open_input(): Add braces to shut up gcc warning.
Diego Biurrun [Thu, 7 Jul 2011 00:01:07 +0000 (02:01 +0200)]
avformat_open_input(): Add braces to shut up gcc warning.

libavformat/utils.c:599: warning: missing braces around initializer
libavformat/utils.c:599: warning: (near initialization for ‘ap.time_base’)

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 14 Jul 2011 18:44:58 +0000 (20:44 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  APIchanges: fill in missing hashes and dates.
  Add an APIChanges entry and bump minor versions for recent changes.
  ffmpeg: print the low bitrate warning after the codec is openend.
  doxygen: Move function documentation into the macro generating the function.
  doxygen: Make sure parameter names match between .c and .h files.
  h264: move fill_decode_neighbors()/fill_decode_caches() to h264_mvpred.h
  H.264: Add more x86 assembly for 10-bit H.264 predict functions
  lavf: fix invalid reads in avformat_find_stream_info()
  cmdutils: replace opt_default with opt_default2() and remove set_context_opts
  ffmpeg: use new avcodec_open2 and avformat_find_stream_info API.
  ffplay: use new avcodec_open2 and avformat_find_stream_info API.
  cmdutils: store all codec options in one dict instead of video/audio/sub
  ffmpeg: check experimental flag after codec is opened.
  ffmpeg: do not set GLOBAL_HEADER flag in the options context

Conflicts:
cmdutils.c
doc/APIchanges
ffmpeg.c
ffplay.c
libavcodec/version.h
libavformat/version.h
libswscale/swscale_unscaled.c

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