ffmpeg.git
8 years agoavconv: get rid of the arbitrary MAX_FILES limit.
Anton Khirnov [Wed, 17 Aug 2011 08:27:17 +0000 (10:27 +0200)]
avconv: get rid of the arbitrary MAX_FILES limit.

8 years agoavconv: get rid of the output_streams_for_file vs. ost_table schizophrenia
Anton Khirnov [Wed, 17 Aug 2011 08:21:37 +0000 (10:21 +0200)]
avconv: get rid of the output_streams_for_file vs. ost_table schizophrenia

Instead store output streams in the same way as input streams.

8 years agoavconv: add a wrapper for output AVFormatContexts and merge output_opts into it
Anton Khirnov [Wed, 17 Aug 2011 07:56:08 +0000 (09:56 +0200)]
avconv: add a wrapper for output AVFormatContexts and merge output_opts into it

8 years agoavconv: make itsscale syntax consistent with other options.
Anton Khirnov [Wed, 17 Aug 2011 07:12:04 +0000 (09:12 +0200)]
avconv: make itsscale syntax consistent with other options.

Move the stream specifier to the option name.

8 years agoavconv: factor out adding input streams.
Anton Khirnov [Tue, 5 Jul 2011 17:38:50 +0000 (19:38 +0200)]
avconv: factor out adding input streams.

8 years agoavconv: Factorize combining auto vsync with format.
Alex Converse [Wed, 17 Aug 2011 02:06:46 +0000 (19:06 -0700)]
avconv: Factorize combining auto vsync with format.

8 years agoavconv: Factorize video resampling.
Alex Converse [Wed, 17 Aug 2011 01:43:27 +0000 (18:43 -0700)]
avconv: Factorize video resampling.

8 years agoavconv: Don't unnecessarily convert ipts to a double.
Alex Converse [Tue, 16 Aug 2011 21:41:16 +0000 (14:41 -0700)]
avconv: Don't unnecessarily convert ipts to a double.

8 years agoffmpeg: remove unsed variable nopts
Diego Biurrun [Wed, 17 Aug 2011 13:35:42 +0000 (15:35 +0200)]
ffmpeg: remove unsed variable nopts

8 years agoRV3/4 parser: remove unused variable 'off'
Kostya Shishkov [Wed, 17 Aug 2011 13:07:49 +0000 (15:07 +0200)]
RV3/4 parser: remove unused variable 'off'

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoadd XMV demuxer
Sven Hesse [Tue, 16 Aug 2011 19:26:45 +0000 (21:26 +0200)]
add XMV demuxer

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agormdec: parse FPS in RealMedia properly
Kostya Shishkov [Tue, 16 Aug 2011 07:10:57 +0000 (09:10 +0200)]
rmdec: parse FPS in RealMedia properly

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoUse parsers for RealVideo 3/4 to determine correct PTS
Kostya Shishkov [Mon, 15 Aug 2011 10:03:40 +0000 (12:03 +0200)]
Use parsers for RealVideo 3/4 to determine correct PTS

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agormdec: correct DTS calculation in RealMedia container.
Kostya Shishkov [Thu, 11 Aug 2011 12:44:05 +0000 (14:44 +0200)]
rmdec: correct DTS calculation in RealMedia container.

First, container stores only DTS and not PTS as it was believed.
Second, multiple frames in a packet store timestamp instead of position
after the frame length.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agorv10/20: tell decoder to use edge emulation
Kostya Shishkov [Wed, 17 Aug 2011 08:36:33 +0000 (10:36 +0200)]
rv10/20: tell decoder to use edge emulation

This removes out-of-edge motion compensation artifacts (easily spotted green
blocks in avplay, gray blocks in transcoding), for example here:
http://samples.libav.org/samples/real/tv_watching_t1.rm

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 17 Aug 2011 12:23:20 +0000 (14:23 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Revert "avconv: use stream copy by default when possible."
  avconv: print stream copy information.
  avconv: use stream copy by default when possible.
  matroskaenc: vertical alignment.
  matroskaenc: implement query_codec()
  lavf: add avformat_query_codec().
  lavc: add avcodec_get_type() for mapping codec_id -> type.
  flvenc: use int64_t to store offsets
  avconv: don't segfault on 0 input files.
  Do not write ID3v1 tags by default
  mpegts: log into an AVFormatContext rather than MpegTSContext.

Conflicts:
doc/APIchanges
libavcodec/version.h
libavformat/avformat.h
libavformat/mp3enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoavconv: Correct Copyright statement.
Michael Niedermayer [Wed, 17 Aug 2011 12:00:25 +0000 (14:00 +0200)]
avconv: Correct Copyright statement.
this more than 4000 line file has less than 600 lines that are not in ffmpeg.c
and they are largely cosmetic changes from ffmpeg.c.
Thus the copyright statement from ffmpeg.c should be used.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agolavfi: add aresample filter
Mina Nagy Zaki [Wed, 17 Aug 2011 11:00:20 +0000 (13:00 +0200)]
lavfi: add aresample filter

Based on a patch by Stefano.

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agoffprobe: in value_string(), do not print trailing space in case of no suffix
Stefano Sabatini [Tue, 16 Aug 2011 22:34:15 +0000 (00:34 +0200)]
ffprobe: in value_string(), do not print trailing space in case of no suffix

8 years agoffplay: do not erase the content of vfilters
Stefano Sabatini [Tue, 16 Aug 2011 22:18:06 +0000 (00:18 +0200)]
ffplay: do not erase the content of vfilters

This way the content of "vfilters" can be reused.

For example when the frame size changes, the filterchain is
reconfigured reusing again the vfilters value.

8 years agoffplay: increase log level of the message issued when the stream frame size changes
Stefano Sabatini [Tue, 16 Aug 2011 22:15:34 +0000 (00:15 +0200)]
ffplay: increase log level of the message issued when the stream frame size changes

Use av_log(AV_LOG_LEVEL...) rather than av_dlog, the log is useful
even for "normal" debugging, and consistent with what is done in
ffmpeg.

Also change the message to achieve better consistency with the
corresponding ffmpeg message.

8 years agoffplay: in input_config_props(), prefer "s" over unnecessary "c" temporary variable
Stefano Sabatini [Tue, 16 Aug 2011 15:34:50 +0000 (17:34 +0200)]
ffplay: in input_config_props(), prefer "s" over unnecessary "c" temporary variable

Sligthly improve readability, reduce redundancy.

8 years agoffplay: in input_config_props(), honour the SAR specified in the codec context
Stefano Sabatini [Tue, 16 Aug 2011 15:26:31 +0000 (17:26 +0200)]
ffplay: in input_config_props(), honour the SAR specified in the codec context

Use the value specified in the codec context for setting the
filterchain sample aspect ratio, when it is not specified in the
stream context.

Consistent with the ffmpeg behavior.

Fix trac issue #398.

8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 16 Aug 2011 21:47:35 +0000 (23:47 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: change AV_LOG_INFO to AV_LOG_WARNING for some warnings
  avconv: remove a write-only variable
  avconv: remove pointless parameter from new_*_stream().
  avconv: cosmetics, move code
  avconv: cosmetics -- move copy_chapters().
  avconv: cosmetics -- move parse_forced_key_frames().
  lavc: add audio flag to the 'b' option, deprecate 'ab'.
  avconv: rename sameq to same_quant
  doc/avconv: add forgotten end of chapter.
  Changelog: document avconv incompatibilities with ffmpeg.
  avconv: replace -vcodec/-acodec/-scodec with a better system.
  avconv: remove presets.
  svq3: propagate codec memory allocation failure in context init

Conflicts:
Changelog
avconv.c
libavcodec/options.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoFix compilation with --disable-avfilter.
Carl Eugen Hoyos [Tue, 16 Aug 2011 21:31:09 +0000 (23:31 +0200)]
Fix compilation with --disable-avfilter.

8 years agoFix VC-1 width/height handling.
Reimar Döffinger [Sat, 13 Aug 2011 09:32:10 +0000 (11:32 +0200)]
Fix VC-1 width/height handling.

avcodec_set_dimensions should be used for size changes to ensure
compatibility with future changes.
avctx->width/avctx->height may not be set to display-only dimensions.
Even more so since vc1dec.c would later set coded_width/height based
on this.
coded_width/coded_height should be used instead of width/height for
decoder setup.
This fixes playback of e.g. zz-mcr-nsqr.vc1 sample (containing
display width/height settings) in MPlayer and should fix a crash
with MPC: http://forum.doom9.org/showthread.php?t=162221.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoRevert "avconv: use stream copy by default when possible."
Anton Khirnov [Tue, 16 Aug 2011 18:59:14 +0000 (20:59 +0200)]
Revert "avconv: use stream copy by default when possible."

This reverts commit 4f4f33844a7369e5579912cc02f3c5376b1e6872.

This commit has some ugly corner cases and needs to be discussed
further.

8 years agoavconv: print stream copy information.
Anton Khirnov [Tue, 16 Aug 2011 04:58:52 +0000 (06:58 +0200)]
avconv: print stream copy information.

8 years agoavconv: use stream copy by default when possible.
Anton Khirnov [Sat, 13 Aug 2011 06:37:13 +0000 (08:37 +0200)]
avconv: use stream copy by default when possible.

8 years agomatroskaenc: vertical alignment.
Anton Khirnov [Tue, 16 Aug 2011 04:52:50 +0000 (06:52 +0200)]
matroskaenc: vertical alignment.

8 years agomatroskaenc: implement query_codec()
Anton Khirnov [Thu, 11 Aug 2011 18:35:46 +0000 (20:35 +0200)]
matroskaenc: implement query_codec()

8 years agolavf: add avformat_query_codec().
Anton Khirnov [Thu, 11 Aug 2011 18:34:45 +0000 (20:34 +0200)]
lavf: add avformat_query_codec().

It allows to check if a given codec can be written into a container.

8 years agolavc: add avcodec_get_type() for mapping codec_id -> type.
Anton Khirnov [Thu, 11 Aug 2011 15:45:50 +0000 (17:45 +0200)]
lavc: add avcodec_get_type() for mapping codec_id -> type.

8 years agoflvenc: use int64_t to store offsets
Luca Barbato [Wed, 8 Jun 2011 14:32:07 +0000 (14:32 +0000)]
flvenc: use int64_t to store offsets

Metadata currently is written only at the start of the file in normal
cases, when transcoding from a rtmp source metadata could be
written later and the offset recorded can exceed 32bit.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoavconv: don't segfault on 0 input files.
Anton Khirnov [Tue, 16 Aug 2011 09:32:57 +0000 (11:32 +0200)]
avconv: don't segfault on 0 input files.

8 years agoDo not write ID3v1 tags by default
Diogo Franco [Tue, 16 Aug 2011 09:43:23 +0000 (09:43 +0000)]
Do not write ID3v1 tags by default

ID3v1 are legacy tags with several limitations; furthermore
avconv/ffmpeg writes the tags in UTF-8 which probably has near-0
software support.

Add a -write_id3v1 option to be able to turn it on; disabled by default.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agompegts: log into an AVFormatContext rather than MpegTSContext.
Alex Converse [Tue, 16 Aug 2011 01:14:12 +0000 (18:14 -0700)]
mpegts: log into an AVFormatContext rather than MpegTSContext.

MpegTSContext's AVClass member can be NULL.

8 years agoaf_format: prefer strtok_r() over strsep()
Stefano Sabatini [Tue, 16 Aug 2011 00:02:44 +0000 (02:02 +0200)]
af_format: prefer strtok_r() over strsep()

strsep() is not POSIX compliant, and thus not supported on some platform.
Fix compilation on Solaris.

8 years agolavfi: complain and exit for invalid named values in ff_parse_packing_format()
Stefano Sabatini [Mon, 15 Aug 2011 23:59:50 +0000 (01:59 +0200)]
lavfi: complain and exit for invalid named values in ff_parse_packing_format()

8 years agoavconv: fix uninitialized variable
Michael Niedermayer [Tue, 16 Aug 2011 10:18:37 +0000 (12:18 +0200)]
avconv: fix uninitialized variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomovenc: change AV_LOG_INFO to AV_LOG_WARNING for some warnings
Anton Khirnov [Thu, 11 Aug 2011 14:33:03 +0000 (16:33 +0200)]
movenc: change AV_LOG_INFO to AV_LOG_WARNING for some warnings

8 years agoavconv: remove a write-only variable
Anton Khirnov [Mon, 15 Aug 2011 16:26:56 +0000 (18:26 +0200)]
avconv: remove a write-only variable

8 years agoavconv: remove pointless parameter from new_*_stream().
Anton Khirnov [Sat, 13 Aug 2011 06:23:44 +0000 (08:23 +0200)]
avconv: remove pointless parameter from new_*_stream().

New streams are always added to the last output file.

8 years agoavconv: cosmetics, move code
Anton Khirnov [Sat, 13 Aug 2011 06:08:13 +0000 (08:08 +0200)]
avconv: cosmetics, move code

Move find_codec_or_die(), choose_codec(), new_output_stream() and
read_avserver_streams() below transcode() where they belong.

8 years agoavconv: cosmetics -- move copy_chapters().
Anton Khirnov [Sat, 13 Aug 2011 05:56:38 +0000 (07:56 +0200)]
avconv: cosmetics -- move copy_chapters().

It's only used in opt_output_file(), so move it right above
opt_output_file().

8 years agoavconv: cosmetics -- move parse_forced_key_frames().
Anton Khirnov [Sat, 13 Aug 2011 05:55:04 +0000 (07:55 +0200)]
avconv: cosmetics -- move parse_forced_key_frames().

parse_forced_key_frames() is only used in new_video_stream(), so move it
right above new_video_stream().

8 years agolavc: add audio flag to the 'b' option, deprecate 'ab'.
Anton Khirnov [Tue, 9 Aug 2011 11:56:36 +0000 (13:56 +0200)]
lavc: add audio flag to the 'b' option, deprecate 'ab'.

Its only reason for its existence was ffmpeg's inability to properly assign
AVOptions to streams. Now this is not a problem anymore, so 'ab' should
go.

8 years agoavconv: rename sameq to same_quant
Anton Khirnov [Tue, 9 Aug 2011 09:32:16 +0000 (11:32 +0200)]
avconv: rename sameq to same_quant

It's often mistakenly used as 'same quality', emphasize that it's not
true in the manual.

8 years agodoc/avconv: add forgotten end of chapter.
Anton Khirnov [Tue, 9 Aug 2011 09:05:04 +0000 (11:05 +0200)]
doc/avconv: add forgotten end of chapter.

8 years agoChangelog: document avconv incompatibilities with ffmpeg.
Anton Khirnov [Fri, 29 Jul 2011 12:17:01 +0000 (14:17 +0200)]
Changelog: document avconv incompatibilities with ffmpeg.

8 years agoavconv: replace -vcodec/-acodec/-scodec with a better system.
Anton Khirnov [Mon, 8 Aug 2011 12:29:37 +0000 (14:29 +0200)]
avconv: replace -vcodec/-acodec/-scodec with a better system.

The new option doesn't depend on its placement wrt -new* options (which
don't exist anymore) and works in a similar way as per-stream AVOptions.

-[vas]codec remain as aliases to -codec:[vas]

8 years agoavconv: remove presets.
Anton Khirnov [Fri, 12 Aug 2011 17:19:19 +0000 (19:19 +0200)]
avconv: remove presets.

Nothing except x264 uses them and native x264 presets should be used
with private options.

8 years agofate: more cases of avconv that should be conditional
Michael Niedermayer [Tue, 16 Aug 2011 01:38:00 +0000 (03:38 +0200)]
fate: more cases of avconv that should be conditional

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agofate: some shells parse $11 as ${1}1
Michael Niedermayer [Mon, 15 Aug 2011 22:29:09 +0000 (00:29 +0200)]
fate: some shells parse $11 as ${1}1

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

* qatar/master:
  Fix NASM include directive
  dsputil_mmx: Honor HAVE_AMD3DNOW
  lavf,lavd: remove all usage of AVFormatParameters from demuxers.
  jack: add 'channels' private option.
  VC-1: fix reading of custom PAR.
  Remove redundant and dubious video codec detection by its extradata
  mpeg12: remove repeat-field code disabled since May 2002
  patch checklist: suggest fate instead of regression tests
  Turn on resampling on sudden size change instead of bailing out during recode.
  avtools: reinitialise filter chain when input video stream changes dimensions

Conflicts:
Makefile
avconv.c
doc/developer.texi
ffplay.c
libavcodec/x86/dsputil_mmx.c
libavdevice/libdc1394.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agofate: allow specifying the tool to use for fate (avconv / ffmpeg)
Michael Niedermayer [Mon, 15 Aug 2011 21:11:46 +0000 (23:11 +0200)]
fate: allow specifying the tool to use for fate (avconv / ffmpeg)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoconfigure: fix datadir after avconv merge
Michael Niedermayer [Mon, 15 Aug 2011 20:36:13 +0000 (22:36 +0200)]
configure: fix datadir after avconv merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosvq3: propagate codec memory allocation failure in context init
Dustin Brody [Fri, 12 Aug 2011 16:05:46 +0000 (12:05 -0400)]
svq3: propagate codec memory allocation failure in context init

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoFix NASM include directive
Dave Yeo [Sun, 14 Aug 2011 18:46:18 +0000 (11:46 -0700)]
Fix NASM include directive

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
8 years agodsputil_mmx: Honor HAVE_AMD3DNOW
Alex Converse [Sun, 14 Aug 2011 03:02:37 +0000 (20:02 -0700)]
dsputil_mmx: Honor HAVE_AMD3DNOW

8 years agolavf,lavd: remove all usage of AVFormatParameters from demuxers.
Anton Khirnov [Sun, 17 Jul 2011 05:45:33 +0000 (07:45 +0200)]
lavf,lavd: remove all usage of AVFormatParameters from demuxers.

AVFormatParameters are converted into corresponding private options in
av_open_input_file/stream() compat wrappers, so accessing them from
demuxers is redundant.

8 years agojack: add 'channels' private option.
Anton Khirnov [Sun, 17 Jul 2011 06:08:57 +0000 (08:08 +0200)]
jack: add 'channels' private option.

Get rid of AVFormatParameters usage.

8 years agoVC-1: fix reading of custom PAR.
Reimar Döffinger [Sat, 13 Aug 2011 09:58:18 +0000 (11:58 +0200)]
VC-1: fix reading of custom PAR.

Custom PAR num/denum are in 1-256 range.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agoRemove redundant and dubious video codec detection by its extradata
Kostya Shishkov [Sun, 14 Aug 2011 18:02:26 +0000 (20:02 +0200)]
Remove redundant and dubious video codec detection by its extradata

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agompeg12: remove repeat-field code disabled since May 2002
Dustin Brody [Fri, 12 Aug 2011 05:30:20 +0000 (01:30 -0400)]
mpeg12: remove repeat-field code disabled since May 2002

Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years agopatch checklist: suggest fate instead of regression tests
Michael Niedermayer [Sat, 9 Apr 2011 10:50:03 +0000 (10:50 +0000)]
patch checklist: suggest fate instead of regression tests

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoTurn on resampling on sudden size change instead of bailing out during recode.
Kostya [Sat, 13 Aug 2011 16:44:21 +0000 (16:44 +0000)]
Turn on resampling on sudden size change instead of bailing out during recode.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoavtools: reinitialise filter chain when input video stream changes dimensions
Kostya [Sat, 13 Aug 2011 16:44:04 +0000 (16:44 +0000)]
avtools: reinitialise filter chain when input video stream changes dimensions

Signed-off-by: Anton Khirnov <anton@khirnov.net>
8 years agoh264pred_init_arm: compile hotfix
Michael Niedermayer [Mon, 15 Aug 2011 04:14:02 +0000 (06:14 +0200)]
h264pred_init_arm: compile hotfix

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoffplay: more precise audio clock based on current time
Marton Balint [Sun, 14 Aug 2011 18:21:25 +0000 (20:21 +0200)]
ffplay: more precise audio clock based on current time

Since SDL has no audio buffer fullness info, one can get a much precise audio
clock based on the last time of the audio callback and the elapsed time since.

To achieve this I introduced the audio_current_pts and audio_current_pts_drift
variables (similar to video_current_pts and video_current_pts_drift) and
calculate them in the end of the audio callback, when VideoState->audio_clock
is already updated. The reference time I use is from the start of the audio
callback, because this way the amount of time used for audio decoding is not
interfereing with calculation.

I also replaced the audio_write_get_buf_size function with a calculated
variable because when the audio frame decoding is in progress audio_buf_size
and audio_buf_index are not stable, so using them from other threads are not a
good idea.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoaf_aformat: hotfix compile due to strsep()
Michael Niedermayer [Mon, 15 Aug 2011 01:35:25 +0000 (03:35 +0200)]
af_aformat: hotfix compile due to strsep()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agofate-rsync: switch to our server in preparation of h264 4:2:2 tests
Michael Niedermayer [Sun, 14 Aug 2011 22:41:23 +0000 (00:41 +0200)]
fate-rsync: switch to our server in preparation of h264 4:2:2 tests

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agomxf: H.264/MPEG-4 AVC Intra support
Baptiste Coudurier [Sun, 14 Aug 2011 22:40:54 +0000 (00:40 +0200)]
mxf: H.264/MPEG-4 AVC Intra support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoh264dec: h264: 4:2:2 intra decoding
Baptiste Coudurier [Sun, 14 Aug 2011 22:39:55 +0000 (00:39 +0200)]
h264dec: h264: 4:2:2 intra decoding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodsputil_mmx: fix indention
Baptiste Coudurier [Sun, 14 Aug 2011 22:37:19 +0000 (00:37 +0200)]
dsputil_mmx: fix indention

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agompegvideo: Fix vshift vs hshift typo
Baptiste Coudurier [Sun, 14 Aug 2011 22:34:41 +0000 (00:34 +0200)]
mpegvideo: Fix vshift vs hshift typo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 14 Aug 2011 17:49:04 +0000 (19:49 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aacenc: Fix number of coefficients used in a LFE channel.
  aacenc: Fix a segfault with grouped psymodel.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosws: remove hScale16NX_c()
Michael Niedermayer [Sun, 14 Aug 2011 17:19:45 +0000 (19:19 +0200)]
sws: remove hScale16NX_c()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosws: remove hScale16N() and use ronalds reformated version of it.
Michael Niedermayer [Sun, 14 Aug 2011 17:05:03 +0000 (19:05 +0200)]
sws: remove hScale16N() and use ronalds reformated version of it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agosws: remove unneeded code from last merge
Michael Niedermayer [Sun, 14 Aug 2011 13:22:50 +0000 (15:22 +0200)]
sws: remove unneeded code from last merge

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
8 years agovf_unsharp: set default chroma size value to 5x5
Stefano Sabatini [Sat, 13 Aug 2011 14:30:44 +0000 (16:30 +0200)]
vf_unsharp: set default chroma size value to 5x5

The previous default value 0x0 was not good, since it is not even
valid.

8 years agovf_unsharp: fix out-of-buffer read
Stefano Sabatini [Fri, 12 Aug 2011 06:42:35 +0000 (08:42 +0200)]
vf_unsharp: fix out-of-buffer read

In apply_unsharp(), when y is >= height, prevent out-of-buffer reading
from src, read from the last buffer line in src2 instead.

The check was implemented in the original unsharp libmpcodecs code and
lost in the port.

This also fixes output discrepancy between the two filters.

8 years agolavfi: remove delogo mp wrapper
Stefano Sabatini [Sun, 14 Aug 2011 10:04:23 +0000 (12:04 +0200)]
lavfi: remove delogo mp wrapper

The delogo filter has been natively integrated into libavfilter,
simplify.

8 years agolavfi: port libmpcodecs delogo filter
Stefano Sabatini [Wed, 10 Aug 2011 16:58:49 +0000 (18:58 +0200)]
lavfi: port libmpcodecs delogo filter

The ported filter supports named option parsing and more YUV formats.

8 years agolavfi: add aformat filter
Mina Nagy Zaki [Thu, 14 Jul 2011 11:18:13 +0000 (14:18 +0300)]
lavfi: add aformat filter

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agolavfi: add internal functions for parsing format arguments
Mina Nagy Zaki [Thu, 4 Aug 2011 09:28:14 +0000 (12:28 +0300)]
lavfi: add internal functions for parsing format arguments

Signed-off-by: Stefano Sabatini <stefano.sabatini-lala@poste.it>
8 years agoaacenc: Fix number of coefficients used in a LFE channel.
Nathan Caldwell [Fri, 29 Jul 2011 20:49:04 +0000 (14:49 -0600)]
aacenc: Fix number of coefficients used in a LFE channel.

The spec states:

 *  Only the lowest 12 spectral coefficients of any LFE may be non-zero

We were using the 12 lowest *bands*.

8 years agoaacenc: Fix a segfault with grouped psymodel.
Nathan Caldwell [Sat, 23 Jul 2011 07:19:34 +0000 (01:19 -0600)]
aacenc: Fix a segfault with grouped psymodel.

10l: Forgot about TYPE_LFE being after TYPE_CPE. Which causes a
segfault when encoding 5.1

8 years agovsink_buffer: make the buffer cache all the incoming frames
Stefano Sabatini [Wed, 29 Jun 2011 15:31:16 +0000 (17:31 +0200)]
vsink_buffer: make the buffer cache all the incoming frames

Allow to cache more than one frame (e.g. for filters which return
more than one frame when avfilter_request_frame() is called on them),
and do not discard previously cached frames when a new one is added.

8 years agofifo: return AVERROR(ENOMEM) rather -1 in av_fifo_realloc2()
Stefano Sabatini [Sat, 13 Aug 2011 17:11:05 +0000 (19:11 +0200)]
fifo: return AVERROR(ENOMEM) rather -1 in av_fifo_realloc2()

8 years agofifo: apply misc cosmetic fixes
Stefano Sabatini [Sat, 13 Aug 2011 17:10:05 +0000 (19:10 +0200)]
fifo: apply misc cosmetic fixes

8 years agofifo: add av_fifo_peek2(), and deprecate av_fifo_peek()
Stefano Sabatini [Sat, 13 Aug 2011 16:26:01 +0000 (18:26 +0200)]
fifo: add av_fifo_peek2(), and deprecate av_fifo_peek()

The new function provides a more flexible interface for peeking at a
FIFO buffer data.

8 years agolavdev/lavfi: correctly set the inout pad index when linking a filter to the output...
Stefano Sabatini [Sat, 13 Aug 2011 23:17:02 +0000 (01:17 +0200)]
lavdev/lavfi: correctly set the inout pad index when linking a filter to the output sink

In lavfi_read_header(), use the pad index designated in the inout for
linking an output to a sink, rather than always 0. Fix link creation
for filters with more than one output (e.g. the split filter).

8 years agoVC-1: fix reading of custom PAR.
Reimar Döffinger [Sat, 13 Aug 2011 09:58:18 +0000 (11:58 +0200)]
VC-1: fix reading of custom PAR.

Custom PAR num/denum are coded -1.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoSupport streaming .au files.
Reimar Döffinger [Sat, 13 Aug 2011 10:06:09 +0000 (12:06 +0200)]
Support streaming .au files.

FFmpeg writes data_size as AU_UNKNOWN_SIZE, make demuxer not
fail when data_size is set to this value.
Should fix trac issue #394.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
8 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 13 Aug 2011 20:23:40 +0000 (22:23 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  swscale: add dithering to yuv2yuvX_altivec_real
  rv34: free+allocate buffer instead of reallocating it to preserve alignment
  h264: add missing brackets.
  swscale: use 15-bit intermediates for 9/10-bit scaling.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
8 years agodv: honor timecode in DV muxer.
Clément Bœsch [Wed, 6 Jul 2011 13:08:28 +0000 (15:08 +0200)]
dv: honor timecode in DV muxer.

This is based on the original work by Baptiste Coudurier.

8 years agomxf: honor timecode drop flag in mxf muxer if set.
Clément Bœsch [Tue, 26 Jul 2011 09:31:00 +0000 (11:31 +0200)]
mxf: honor timecode drop flag in mxf muxer if set.

8 years agomxf: add cli option in mxfenc to replace GOP timecode parsing.
Clément Bœsch [Wed, 6 Jul 2011 14:35:12 +0000 (16:35 +0200)]
mxf: add cli option in mxfenc to replace GOP timecode parsing.

This is based on the original work by Baptiste Coudurier.

8 years agomxf: move framenum to timecode convert to timecode helpers.
Clément Bœsch [Wed, 6 Jul 2011 13:04:26 +0000 (15:04 +0200)]
mxf: move framenum to timecode convert to timecode helpers.

This is based on the original work by Baptiste Coudurier.