ffmpeg.git
9 years agoav_string: add av_asprintf().
Clément Bœsch [Sat, 3 Sep 2011 17:51:28 +0000 (19:51 +0200)]
av_string: add av_asprintf().

9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 4 Sep 2011 02:11:53 +0000 (04:11 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  AVOptions: fix av_set_string3() doxy to match reality.
  cmdutils: get rid of dummy contexts for examining AVOptions.
  lavf,lavc,sws: add {avcodec,avformat,sws}_get_class() functions.
  AVOptions: add AV_OPT_SEARCH_FAKE_OBJ flag for av_opt_find().
  cpu detection: avoid a signed overflow

Conflicts:
avconv.c
cmdutils.c
doc/APIchanges
ffmpeg.c
libavcodec/options.c
libavcodec/version.h
libavformat/version.h
libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: fix reading from stdin on windows
Michael Niedermayer [Sat, 3 Sep 2011 22:24:06 +0000 (00:24 +0200)]
ffmpeg: fix reading from stdin on windows

Based on code by Rolf Siegrist
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agohttp: Fix decetion of range support in HTTP servers
Stefan Fritsch [Sat, 3 Sep 2011 20:29:07 +0000 (22:29 +0200)]
http:  Fix decetion of range support in HTTP servers

currently libavformat only allows seeking if a request with "Range:
0-" results in a 206 reply from the HTTP server which includes a
Content-Range header. But according to RFC 2616, the server may also
reply with a normal 200 reply (which is more efficient for a request
for the whole file). In fact Apache HTTPD 2.2.20 has changed the
behaviour in this way and it looks like this change will be kept in
future versions. The fix for libavformat is easy: Also look at the
Accept-Ranges header.

9 years agoAVOptions: fix av_set_string3() doxy to match reality.
Anton Khirnov [Tue, 23 Aug 2011 05:46:51 +0000 (07:46 +0200)]
AVOptions: fix av_set_string3() doxy to match reality.

Fixes bug 28.

9 years agocmdutils: get rid of dummy contexts for examining AVOptions.
Anton Khirnov [Tue, 23 Aug 2011 05:43:54 +0000 (07:43 +0200)]
cmdutils: get rid of dummy contexts for examining AVOptions.

Replace it with newly introduced libavutil API.

9 years agolavf,lavc,sws: add {avcodec,avformat,sws}_get_class() functions.
Anton Khirnov [Tue, 23 Aug 2011 05:23:52 +0000 (07:23 +0200)]
lavf,lavc,sws: add {avcodec,avformat,sws}_get_class() functions.

9 years agoAVOptions: add AV_OPT_SEARCH_FAKE_OBJ flag for av_opt_find().
Anton Khirnov [Tue, 23 Aug 2011 05:11:26 +0000 (07:11 +0200)]
AVOptions: add AV_OPT_SEARCH_FAKE_OBJ flag for av_opt_find().

It allows to search for options only with AVClass, without allocating
the corresponding context.

9 years agocpu detection: avoid a signed overflow
Sean McGovern [Mon, 25 Jul 2011 22:51:02 +0000 (18:51 -0400)]
cpu detection: avoid a signed overflow

1<<31 overflows because 1 is signed, so force it to unsigned.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 3 Sep 2011 02:48:43 +0000 (04:48 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  codec-regression: force vsync 0 on the me_threshold test to make sure frames match.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agocmdutils: revert avconv rename of pathes
Michael Niedermayer [Fri, 2 Sep 2011 22:15:15 +0000 (00:15 +0200)]
cmdutils: revert avconv rename of pathes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoRevert "ffmpeg: remove presets." and reimplement the needed parts that no longer...
Michael Niedermayer [Fri, 2 Sep 2011 21:49:07 +0000 (23:49 +0200)]
Revert "ffmpeg: remove presets." and reimplement the needed parts that no longer exist.
Needed by libvpx

This reverts commit a0147957e70aecd9d3e06f69a53d26456f061fc9.

9 years agodoc: issue tracking: explain the term issue
Alexander Strasser [Tue, 30 Aug 2011 23:25:13 +0000 (01:25 +0200)]
doc: issue tracking: explain the term issue

  Transforms the loose enumeration of issues that was to far below
in the text into a more verbose paragraph at the top. The new text
also mentions the possibility to propose new types of issues to
track on the development mailing list.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
9 years agodoc: issue tracking: add more vertical whitespace
Alexander Strasser [Tue, 30 Aug 2011 23:24:06 +0000 (01:24 +0200)]
doc: issue tracking: add more vertical whitespace

  This change makes the first part of the file easier to read quickly.
It makes it also easier to spot the URLs which might be one of the main
interests of many readers.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
9 years agodoc: issue tracking: fix grammar/spelling
Alexander Strasser [Tue, 30 Aug 2011 23:23:42 +0000 (01:23 +0200)]
doc: issue tracking: fix grammar/spelling

  Correct a few grammar and spelling errors. Also improve consistency
by always referring to substatus (not substate).

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
9 years agoParse MXF partitions
Tomas Härdin [Mon, 7 Feb 2011 15:07:41 +0000 (16:07 +0100)]
Parse MXF partitions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agompeg4: adjust dummy frame threashold for packed divx.
Michael Niedermayer [Fri, 2 Sep 2011 16:00:31 +0000 (18:00 +0200)]
mpeg4: adjust dummy frame threashold for packed divx.
Fixes Ticket427

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoopenal-dec: fix missing list_devices unit for list_devices AVOption
Michael Niedermayer [Fri, 2 Sep 2011 03:28:31 +0000 (05:28 +0200)]
openal-dec: fix missing list_devices unit for list_devices AVOption

Found-by: Ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agodvdec: Fix dvsd profile[1] detection.
Michael Niedermayer [Fri, 2 Sep 2011 03:21:25 +0000 (05:21 +0200)]
dvdec: Fix dvsd profile[1] detection.
Fixes Ticket159
If someone knows of a cleaner way to detect this, patch is welcome.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agocodec-regression: force vsync 0 on the me_threshold test to make sure frames match.
Alex Converse [Wed, 31 Aug 2011 20:57:01 +0000 (13:57 -0700)]
codec-regression: force vsync 0 on the me_threshold test to make sure frames match.

9 years agoRevert "mjpeg: treat external huffman table setup failure as codec init failure if...
Michael Niedermayer [Thu, 1 Sep 2011 23:18:22 +0000 (01:18 +0200)]
Revert "mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested"
This broke mplayer

This reverts commit a18e04bcf989a9d7f5629c573f9d70f8a020c7a7.

9 years agoffmpeg: Fix minor memleak of input_tmp
Chiranjeevi Melam [Thu, 1 Sep 2011 22:16:19 +0000 (00:16 +0200)]
ffmpeg: Fix minor memleak of input_tmp

9 years agojpegdec: better rst skiping
Michael Niedermayer [Thu, 1 Sep 2011 21:43:56 +0000 (23:43 +0200)]
jpegdec: better rst skiping
Fixes Ticket426

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoRemove unused variables.
Reimar Döffinger [Sun, 28 Aug 2011 18:54:11 +0000 (20:54 +0200)]
Remove unused variables.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
9 years agoAutodetect PowerPC vs. PowerPC64.
Reimar Döffinger [Mon, 29 Aug 2011 19:48:31 +0000 (21:48 +0200)]
Autodetect PowerPC vs. PowerPC64.

This is the same code as for x86_64.
This is necessary because uname returns PPC64 if the hardware
is 64 bit, however the userland can still be fully 32 bit.
In that case FFmpeg fails to compile because some macros in the
asm code are set up incorrectly.
For details see https://bugs.gentoo.org/show_bug.cgi?id=341235

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
9 years agoDo not free BITMAPINFOHEADER before we are done using it.
Reimar Döffinger [Sat, 27 Aug 2011 13:06:37 +0000 (15:06 +0200)]
Do not free BITMAPINFOHEADER before we are done using it.

Fixes trac ticket #396.
Completely untested.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
9 years agoMJPEG: emulate EOI also on two consecutive SOI.
Reimar Döffinger [Sat, 27 Aug 2011 12:37:14 +0000 (14:37 +0200)]
MJPEG: emulate EOI also on two consecutive SOI.

Fixes issue #362.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
9 years agoReset cur_scan at more appropriate places.
Reimar Döffinger [Sat, 27 Aug 2011 19:55:57 +0000 (21:55 +0200)]
Reset cur_scan at more appropriate places.

Reset it when we actually process an EOI, not when we actually
decide to ignore it for bug-workarounds, and reset it on
SOF to make it more reliable in case of missing EOI.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
9 years agoffprobe: directly use va args in print fmt callbacks.
Clément Bœsch [Thu, 1 Sep 2011 20:09:15 +0000 (22:09 +0200)]
ffprobe: directly use va args in print fmt callbacks.

9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 1 Sep 2011 20:08:03 +0000 (22:08 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: fix some bugs introduced in 630902a1e1336e7ee0cf3dcbcb6eb07af8edf660
  libmp3lame: fix typo
  AVOptions: drop av_ prefix from static av_get_number().
  libx264: use X264_THREADS_AUTO constant instead of 0.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoresample: fix typo (ouput → output).
Clément Bœsch [Thu, 1 Sep 2011 18:25:32 +0000 (20:25 +0200)]
resample: fix typo (ouput → output).

9 years agoMakefile: remove unused PROGS_G.
Clément Bœsch [Mon, 29 Aug 2011 15:52:16 +0000 (17:52 +0200)]
Makefile: remove unused PROGS_G.

9 years agobuild: introduce --progs-suffix option.
Clément Bœsch [Mon, 29 Aug 2011 15:52:03 +0000 (17:52 +0200)]
build: introduce --progs-suffix option.

9 years agowav: init st to NULL to avoid a false-positive warning.
Clément Bœsch [Thu, 1 Sep 2011 18:06:05 +0000 (20:06 +0200)]
wav: init st to NULL to avoid a false-positive warning.

If st is NULL, it means no 'fmt ' tag is found, but 'data' tag (which
needs a previous 'fmt ' tag to be parsed correctly and st initialized)
check will make sure st is never dereferenced in that case.

9 years agocmdutils: fix uninitialized variable (type) warning.
Clément Bœsch [Thu, 1 Sep 2011 00:56:59 +0000 (02:56 +0200)]
cmdutils: fix uninitialized variable (type) warning.

9 years agosws: fix a huge amount of incompatible pointer type arguments warnings.
Clément Bœsch [Thu, 1 Sep 2011 00:54:27 +0000 (02:54 +0200)]
sws: fix a huge amount of incompatible pointer type arguments warnings.

9 years agoffmpeg: fix two unused variables warnings.
Clément Bœsch [Thu, 1 Sep 2011 00:27:38 +0000 (02:27 +0200)]
ffmpeg: fix two unused variables warnings.

9 years agoresample: fix set but unused variable (lfe) warning.
Clément Bœsch [Thu, 1 Sep 2011 00:15:39 +0000 (02:15 +0200)]
resample: fix set but unused variable (lfe) warning.

9 years agoimgconvert: avoid mixed declarations and code.
Clément Bœsch [Thu, 1 Sep 2011 00:01:54 +0000 (02:01 +0200)]
imgconvert: avoid mixed declarations and code.

9 years agoFix compilation with --disable-avfilter.
Carl Eugen Hoyos [Thu, 1 Sep 2011 17:03:39 +0000 (19:03 +0200)]
Fix compilation with --disable-avfilter.

Fixes ticket #425.

9 years agojpegdec: set color_range
Gavin Kinsey [Thu, 1 Sep 2011 14:18:22 +0000 (16:18 +0200)]
jpegdec: set color_range

9 years agoavconv: fix some bugs introduced in 630902a1e1336e7ee0cf3dcbcb6eb07af8edf660
Michael Niedermayer [Thu, 1 Sep 2011 01:46:04 +0000 (03:46 +0200)]
avconv: fix some bugs introduced in 630902a1e1336e7ee0cf3dcbcb6eb07af8edf660

These caused scrambled error messages to be printed and
floating point exceptions.
For example when there was no decoder available for a
stream.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agolibmp3lame: fix typo
Anton Khirnov [Thu, 1 Sep 2011 08:17:09 +0000 (10:17 +0200)]
libmp3lame: fix typo

FF_API_LAME_GLOBAL_OPTIONS => FF_API_LAME_GLOBAL_OPTS

Thanks to Clément Bœsch for spotting.

9 years agoAVOptions: drop av_ prefix from static av_get_number().
Anton Khirnov [Tue, 23 Aug 2011 08:27:49 +0000 (10:27 +0200)]
AVOptions: drop av_ prefix from static av_get_number().

9 years agolibx264: use X264_THREADS_AUTO constant instead of 0.
Anton Khirnov [Wed, 31 Aug 2011 17:26:01 +0000 (19:26 +0200)]
libx264: use X264_THREADS_AUTO constant instead of 0.

9 years agoffmpeg: Fix typos introduced in:
Michael Niedermayer [Thu, 1 Sep 2011 01:46:04 +0000 (03:46 +0200)]
ffmpeg: Fix typos introduced in:
commit 630902a1e1336e7ee0cf3dcbcb6eb07af8edf660
Author: Anton Khirnov <anton@khirnov.net>
Date:   Wed Jul 6 08:49:07 2011 +0200
avconv: factor out initializing input streams.

These caused scrambled error messages to be printed and
floating point exceptions.
For example when there was no decoder available for a
stream

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovc1: loose one line difference to qatar.
Michael Niedermayer [Thu, 1 Sep 2011 00:38:56 +0000 (02:38 +0200)]
vc1: loose one line difference to qatar.
This should make no functional difference.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agompeg4: fix typo in mpeg4_encode_gop_header()
Michael Niedermayer [Thu, 1 Sep 2011 00:12:15 +0000 (02:12 +0200)]
mpeg4: fix typo in mpeg4_encode_gop_header()

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoReplace some commented-out debug printf() / av_log() messages with av_dlog().
Diego Biurrun [Fri, 29 Apr 2011 15:27:01 +0000 (17:27 +0200)]
Replace some commented-out debug printf() / av_log() messages with av_dlog().

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoAPIchanges: remove "deprecate url_feof"
Michael Niedermayer [Wed, 31 Aug 2011 23:18:56 +0000 (01:18 +0200)]
APIchanges: remove "deprecate url_feof"
url_feof() is usefull when a file is appended to

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 31 Aug 2011 21:44:21 +0000 (23:44 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (31 commits)
  libx264: set default thread count to 0 (auto)
  lavc: cosmetics, group deprecated codec flags
  mpeg12: add 'scan_offset' private option.
  h263/p encoder: add 'structured_slices' private option.
  h263/p encoder: add 'obmc' private option.
  h263p encoder: add 'aiv' private option.
  h263p encoder: add 'umv' private option.
  mpeg12enc/mpeg4videoenc: add 'alternate_scan' private option.
  mjpegdec: add 'extern_huff' private option.
  mpeg4enc: add 'data_partitioning' private option.
  snow: add 'memc_only' private option.
  libx264: add 'mbtree' private option.
  libx264: add 'psy' private option.
  libmp3lame: add 'reservoir' private option.
  mpeg2enc: add 'non_linear_quant' private option
  mpeg12enc: add drop_frame_timecode private option.
  mpeg12enc: add intra_vlc private option.
  VC1: Support dynamic dimension changes
  mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested
  lavc: deprecate CODEC_FLAG2_BRDO
  ...

Conflicts:
avconv.c
libavcodec/libmp3lame.c
libavcodec/libx264.c
libavcodec/mjpegdec.c
libavcodec/mpeg12enc.c
libavcodec/mpegvideo.h
libavcodec/vc1.c
libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibx264: set default thread count to 0 (auto)
Anton Khirnov [Wed, 31 Aug 2011 12:04:02 +0000 (14:04 +0200)]
libx264: set default thread count to 0 (auto)

9 years agovsink_buffer: fix void pointer dereference in av_vsink_buffer_get_video_buffer_ref()
Stefano Sabatini [Mon, 29 Aug 2011 16:46:06 +0000 (18:46 +0200)]
vsink_buffer: fix void pointer dereference in av_vsink_buffer_get_video_buffer_ref()

9 years agolavdev/lavfi: add debug traces in lavfi_read_packet()
Stefano Sabatini [Mon, 29 Aug 2011 16:41:50 +0000 (18:41 +0200)]
lavdev/lavfi: add debug traces in lavfi_read_packet()

9 years agovf_yadif: add support to yuva420p
Stefano Sabatini [Sat, 27 Aug 2011 16:32:14 +0000 (18:32 +0200)]
vf_yadif: add support to yuva420p

9 years agolavc: cosmetics, group deprecated codec flags
Anton Khirnov [Sat, 27 Aug 2011 11:33:10 +0000 (13:33 +0200)]
lavc: cosmetics, group deprecated codec flags

9 years agompeg12: add 'scan_offset' private option.
Anton Khirnov [Sat, 27 Aug 2011 08:16:14 +0000 (10:16 +0200)]
mpeg12: add 'scan_offset' private option.

Deprecate CODEC_FLAG_SVCD_SCAN_OFFSET

9 years agoh263/p encoder: add 'structured_slices' private option.
Anton Khirnov [Sat, 27 Aug 2011 08:16:14 +0000 (10:16 +0200)]
h263/p encoder: add 'structured_slices' private option.

Deprecate CODEC_FLAG_H263P_SLICE_STRUCT

9 years agoh263/p encoder: add 'obmc' private option.
Anton Khirnov [Sat, 27 Aug 2011 08:16:14 +0000 (10:16 +0200)]
h263/p encoder: add 'obmc' private option.

Deprecate CODEC_FLAG_OBMC

9 years agoh263p encoder: add 'aiv' private option.
Anton Khirnov [Sat, 27 Aug 2011 08:16:14 +0000 (10:16 +0200)]
h263p encoder: add 'aiv' private option.

Deprecate CODEC_FLAG_H263P_AIV

9 years agoh263p encoder: add 'umv' private option.
Anton Khirnov [Sat, 27 Aug 2011 08:16:14 +0000 (10:16 +0200)]
h263p encoder: add 'umv' private option.

Deprecate CODEC_FLAG_H263P_UMV

9 years agompeg12enc/mpeg4videoenc: add 'alternate_scan' private option.
Anton Khirnov [Sat, 27 Aug 2011 08:16:14 +0000 (10:16 +0200)]
mpeg12enc/mpeg4videoenc: add 'alternate_scan' private option.

Deprecate CODEC_FLAG_ALT_SCAN

9 years agomjpegdec: add 'extern_huff' private option.
Anton Khirnov [Sat, 27 Aug 2011 08:16:14 +0000 (10:16 +0200)]
mjpegdec: add 'extern_huff' private option.

Deprecate CODEC_FLAG_EXTERN_HUFF

9 years agompeg4enc: add 'data_partitioning' private option.
Anton Khirnov [Sat, 27 Aug 2011 08:16:14 +0000 (10:16 +0200)]
mpeg4enc: add 'data_partitioning' private option.

Deprecate CODEC_FLAG_PART

9 years agosnow: add 'memc_only' private option.
Anton Khirnov [Sat, 27 Aug 2011 08:16:14 +0000 (10:16 +0200)]
snow: add 'memc_only' private option.

Deprecate CODEC_FLAG2_MEMC_ONLY

9 years agolibx264: add 'mbtree' private option.
Anton Khirnov [Sat, 27 Aug 2011 08:16:14 +0000 (10:16 +0200)]
libx264: add 'mbtree' private option.

Deprecate CODEC_FLAG2_MBTREE

9 years agolibx264: add 'psy' private option.
Anton Khirnov [Sat, 27 Aug 2011 08:16:14 +0000 (10:16 +0200)]
libx264: add 'psy' private option.

Deprecate CODEC_FLAG2_PSY

9 years agolibmp3lame: add 'reservoir' private option.
Anton Khirnov [Sat, 27 Aug 2011 08:09:09 +0000 (10:09 +0200)]
libmp3lame: add 'reservoir' private option.

Deprecate CODEC_FLAG2_BIT_RESERVOIR

9 years agompeg2enc: add 'non_linear_quant' private option
Anton Khirnov [Sat, 27 Aug 2011 07:57:36 +0000 (09:57 +0200)]
mpeg2enc: add 'non_linear_quant' private option

Deprecate CODEC_FLAG2_NON_LINEAR_QUANT

9 years agompeg12enc: add drop_frame_timecode private option.
Anton Khirnov [Sat, 27 Aug 2011 06:34:05 +0000 (08:34 +0200)]
mpeg12enc: add drop_frame_timecode private option.

Deprecate CODEC_FLAG2_DROP_FRAME_TIMECODE

9 years agompeg12enc: add intra_vlc private option.
Anton Khirnov [Sat, 27 Aug 2011 06:26:14 +0000 (08:26 +0200)]
mpeg12enc: add intra_vlc private option.

Deprecate CODEC_FLAG2_INTRA_VLC.

9 years agoVC1: Support dynamic dimension changes
Alberto Delmás [Sat, 27 Aug 2011 17:37:26 +0000 (19:37 +0200)]
VC1: Support dynamic dimension changes

Fixes SA00072, SA00073, SA10150, SA10151, Issue2076

Improves SA10153

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agomjpeg: treat external huffman table setup failure as codec init failure if external...
Dustin Brody [Thu, 25 Aug 2011 23:47:01 +0000 (19:47 -0400)]
mjpeg: treat external huffman table setup failure as codec init failure if external huffman table use requested

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agolavc: deprecate CODEC_FLAG2_BRDO
Anton Khirnov [Wed, 24 Aug 2011 14:26:15 +0000 (16:26 +0200)]
lavc: deprecate CODEC_FLAG2_BRDO

It's been unused for the last 3 years.

9 years agolibx264: add 'aud' private option.
Anton Khirnov [Mon, 22 Aug 2011 05:55:34 +0000 (07:55 +0200)]
libx264: add 'aud' private option.

Deprecate CODEC_FLAG2_AUD.

9 years agolibx264: add 'fast-pskip' private option.
Anton Khirnov [Mon, 22 Aug 2011 05:55:34 +0000 (07:55 +0200)]
libx264: add 'fast-pskip' private option.

Deprecate CODEC_FLAG2_FASTPSKIP.

9 years agolibx264: add '8x8dct' private option.
Anton Khirnov [Mon, 22 Aug 2011 05:55:34 +0000 (07:55 +0200)]
libx264: add '8x8dct' private option.

Deprecate CODEC_FLAG2_8X8DCT.

9 years agolibx264: add 'mixed-refs' private option.
Anton Khirnov [Mon, 22 Aug 2011 05:55:34 +0000 (07:55 +0200)]
libx264: add 'mixed-refs' private option.

Deprecate CODEC_FLAG2_MIXED_REFS.

9 years agolibx264: add 'weightb' private option.
Anton Khirnov [Mon, 22 Aug 2011 05:55:34 +0000 (07:55 +0200)]
libx264: add 'weightb' private option.

Deprecate CODEC_FLAG2_BPYRAMID.

9 years agolibx264: add 'b-pyramid' private option.
Anton Khirnov [Mon, 22 Aug 2011 05:55:34 +0000 (07:55 +0200)]
libx264: add 'b-pyramid' private option.

Deprecate CODEC_FLAG2_BPYRAMID.

9 years agolibx264: add 'intra-refresh' private option.
Anton Khirnov [Mon, 22 Aug 2011 05:55:34 +0000 (07:55 +0200)]
libx264: add 'intra-refresh' private option.

Deprecate CODEC_FLAG2_INTRA_REFRESH.

9 years agolibx264: add 'ssim' private option.
Anton Khirnov [Mon, 22 Aug 2011 05:55:34 +0000 (07:55 +0200)]
libx264: add 'ssim' private option.

Deprecate CODEC_FLAG2_SSIM.

9 years agolibx264: make options compatible with x264
Anton Khirnov [Sat, 27 Aug 2011 05:52:03 +0000 (07:52 +0200)]
libx264: make options compatible with x264

Replace '_' with '-', merge psy-trellis into psy-rd and rename cqp->qp
Also fix typo pdy-rd -> psy-rd

9 years agoavcodec: remove misleading comment
Luca Barbato [Mon, 29 Aug 2011 20:47:06 +0000 (22:47 +0200)]
avcodec: remove misleading comment

coded_width is the width before lowres scaling,
coded_height is the height before lowres scaling.

9 years agoh264: clean all non null elements of delayed_pic[]
Michael Niedermayer [Wed, 31 Aug 2011 03:04:14 +0000 (05:04 +0200)]
h264: clean all non null elements of delayed_pic[]

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoh264: change MAX_DELAYED_PIC_COUNT check to av_assert0
Michael Niedermayer [Wed, 31 Aug 2011 03:00:39 +0000 (05:00 +0200)]
h264: change MAX_DELAYED_PIC_COUNT check to av_assert0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge commit 'f593628e5868e52a46de666767896c6afcebdae4'
Michael Niedermayer [Tue, 30 Aug 2011 22:03:59 +0000 (00:03 +0200)]
Merge commit 'f593628e5868e52a46de666767896c6afcebdae4'

* commit 'f593628e5868e52a46de666767896c6afcebdae4':
  avconv: Replace raw picture frame swapping hack.
  RV40: reuse some H.264 motion compensation functions in RV40.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoSupport speex in avi.
Carl Eugen Hoyos [Tue, 30 Aug 2011 21:13:23 +0000 (23:13 +0200)]
Support speex in avi.

9 years agovf_drawtext: add basetime argument to allow specifying the wall clock time of PTS=0
Michael Niedermayer [Tue, 30 Aug 2011 21:37:49 +0000 (23:37 +0200)]
vf_drawtext: add basetime argument to allow specifying the wall clock time of PTS=0
the basetime argument also enables useage of pts instead of time()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolibavfilter/graphparser: Avoid spaces in filter instance names.
Michael Niedermayer [Tue, 30 Aug 2011 20:02:38 +0000 (22:02 +0200)]
libavfilter/graphparser: Avoid spaces in filter instance names.
This makes it easier to refer to filters where things are seperated by spaces.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: ffmpeg: fix reading commands from the keyboard
Michael Niedermayer [Tue, 30 Aug 2011 19:56:40 +0000 (21:56 +0200)]
ffmpeg: ffmpeg: fix reading commands from the keyboard

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavconv: remove -threads option.
Anton Khirnov [Mon, 29 Aug 2011 10:53:08 +0000 (12:53 +0200)]
avconv: remove -threads option.

It's only shadowing the AVOption with the same name.

9 years agoffmpeg: fix reading commands from stdin
Michael Niedermayer [Tue, 30 Aug 2011 18:17:07 +0000 (20:17 +0200)]
ffmpeg: fix reading commands from stdin

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovf_drawtext: fix segfault on reinit
Michael Niedermayer [Tue, 30 Aug 2011 17:47:23 +0000 (19:47 +0200)]
vf_drawtext: fix segfault on reinit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoavconv: Replace raw picture frame swapping hack.
Alex Converse [Tue, 30 Aug 2011 02:28:42 +0000 (19:28 -0700)]
avconv: Replace raw picture frame swapping hack.

9 years agofate: Switch default tool to test from avconv to ffmpeg
Michael Niedermayer [Tue, 30 Aug 2011 16:16:03 +0000 (18:16 +0200)]
fate: Switch default tool to test from avconv to ffmpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffmpeg: re-add nb_streams to InputFile.
Anton Khirnov [Tue, 30 Aug 2011 14:43:11 +0000 (16:43 +0200)]
ffmpeg: re-add nb_streams to InputFile.

It was mistakenly removed in 2cf8355f98681bdd726b739008acd5483f82f8d7,
not taking into account that new streams might appear in av_read_frame()
that avconv doesn't know about.

Fixes bug 24.

9 years agoffmpeg: Replace goto redo on decode fail with continue.
Alex Converse [Tue, 30 Aug 2011 14:39:05 +0000 (16:39 +0200)]
ffmpeg: Replace goto redo on decode fail with continue.

This checks for sigterm but otherwise is identical to the previous
behavior.

9 years agoffmpeg: Remove dead store.
Alex Converse [Tue, 30 Aug 2011 14:38:38 +0000 (16:38 +0200)]
ffmpeg: Remove dead store.

9 years agoffmpeg: use av_clip_int16 for audio clipping
Alex Converse [Tue, 30 Aug 2011 14:38:09 +0000 (16:38 +0200)]
ffmpeg: use av_clip_int16 for audio clipping