ffmpeg.git
6 years agoMerge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'
Michael Niedermayer [Thu, 20 Dec 2012 11:06:15 +0000 (12:06 +0100)]
Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'

* commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011':
  cmdutils: pass number of groups to split_commandline().
  mov: handle h263 and flv1 for codec_tag 'H','2','6','3'
  h264: fix sps parsing for SVC and CAVLC 4:4:4 Intra profiles

Conflicts:
libavcodec/h264_ps.c
libavformat/isom.c
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/select: fix compilation with avcodec disabled.
Clément Bœsch [Thu, 20 Dec 2012 04:17:17 +0000 (05:17 +0100)]
lavfi/select: fix compilation with avcodec disabled.

6 years agoastenc: Remove two AVRationals with denominator 1
James Almer [Wed, 19 Dec 2012 00:48:06 +0000 (21:48 -0300)]
astenc: Remove two AVRationals with denominator 1

They are completely superfluous when using av_rescale_q_rnd().
Call av_rescale_rnd() using what used to be the numerators instead.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: remove unused variable
Michael Niedermayer [Thu, 20 Dec 2012 03:22:21 +0000 (04:22 +0100)]
h264: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg_opt: fix pointer types
Michael Niedermayer [Thu, 20 Dec 2012 03:21:29 +0000 (04:21 +0100)]
ffmpeg_opt: fix pointer types

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo: increase scratchpad sizes
Michael Niedermayer [Thu, 20 Dec 2012 02:53:27 +0000 (03:53 +0100)]
mpegvideo: increase scratchpad sizes

These where reduced in f1d8763a02b5fce9a7d9789e049d74a45b15e1e8
and this change can cause out of array accesses.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/general: sort subtitles formats.
Clément Bœsch [Thu, 20 Dec 2012 02:55:16 +0000 (03:55 +0100)]
doc/general: sort subtitles formats.

6 years agofate: add and fix subtitles dependencies.
Clément Bœsch [Thu, 20 Dec 2012 02:48:02 +0000 (03:48 +0100)]
fate: add and fix subtitles dependencies.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 20 Dec 2012 01:51:35 +0000 (02:51 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo: increase edge_emu_buffer size for VC1
  lavc: merge latest x86inc.asm fixes with x264

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'acb571c89a065d943163c11efb46de35774f1909'
Michael Niedermayer [Thu, 20 Dec 2012 01:44:22 +0000 (02:44 +0100)]
Merge commit 'acb571c89a065d943163c11efb46de35774f1909'

* commit 'acb571c89a065d943163c11efb46de35774f1909':
  avcodec: bump minor for adaptive h264 frame-mt
  avconv: pass the actually selected decoder to filter_codec_opts().

Conflicts:
Changelog
ffmpeg_opt.c
libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocmdutils: implement debug/fdebug log level update differently.
Michael Niedermayer [Thu, 20 Dec 2012 01:15:40 +0000 (02:15 +0100)]
cmdutils: implement debug/fdebug log level update differently.

The old implementation is no longer possibly due to limitations
of the new command line parser.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'
Michael Niedermayer [Thu, 20 Dec 2012 01:38:02 +0000 (02:38 +0100)]
Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'

* commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06':
  avconv: use new options parser.

Conflicts:
ffmpeg.c
ffmpeg.h
ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/faq: move filter links to the ffmpeg-filters.html page.
Clément Bœsch [Wed, 19 Dec 2012 23:20:05 +0000 (00:20 +0100)]
doc/faq: move filter links to the ffmpeg-filters.html page.

6 years agodoc/faq: improve concatenation entry.
Clément Bœsch [Wed, 19 Dec 2012 21:33:41 +0000 (22:33 +0100)]
doc/faq: improve concatenation entry.

6 years agoffmpeg: use GROW_ARRAY in opt_map_channel.
Clément Bœsch [Wed, 19 Dec 2012 21:55:05 +0000 (22:55 +0100)]
ffmpeg: use GROW_ARRAY in opt_map_channel.

6 years agoMerge commit '0ec1642b60a5b1a4d913e2b9e3899173dff77e7a'
Michael Niedermayer [Wed, 19 Dec 2012 21:47:31 +0000 (22:47 +0100)]
Merge commit '0ec1642b60a5b1a4d913e2b9e3899173dff77e7a'

* commit '0ec1642b60a5b1a4d913e2b9e3899173dff77e7a':
  cmdutils: don't log an error in opt_default().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8c9af5b2051b9927f845c7afdfeb30b82670ee77'
Michael Niedermayer [Wed, 19 Dec 2012 21:32:00 +0000 (22:32 +0100)]
Merge commit '8c9af5b2051b9927f845c7afdfeb30b82670ee77'

* commit '8c9af5b2051b9927f845c7afdfeb30b82670ee77':
  cmdutils: add a commandline pre-parser.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a01c02bcff755a7891f777706b27452203aac71e'
Michael Niedermayer [Wed, 19 Dec 2012 21:24:37 +0000 (22:24 +0100)]
Merge commit 'a01c02bcff755a7891f777706b27452203aac71e'

* commit 'a01c02bcff755a7891f777706b27452203aac71e':
  cmdutils: split parse_option().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocmdutils: pass number of groups to split_commandline().
Anton Khirnov [Wed, 19 Dec 2012 20:53:22 +0000 (21:53 +0100)]
cmdutils: pass number of groups to split_commandline().

This makes the code simpler and avoids mixing designated and
non-designated initializers in a potentially unsafe way in avconv.

6 years agoMerge commit '10bca66101b79954512cd9d8ee20c3bc4513adf3'
Michael Niedermayer [Wed, 19 Dec 2012 21:03:54 +0000 (22:03 +0100)]
Merge commit '10bca66101b79954512cd9d8ee20c3bc4513adf3'

* commit '10bca66101b79954512cd9d8ee20c3bc4513adf3':
  cmdutils: add a macro to simplify grow_array() calls.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9e696d2e5ffaa763c564682ec18c3b51b3e5fccc'
Michael Niedermayer [Wed, 19 Dec 2012 20:58:31 +0000 (21:58 +0100)]
Merge commit '9e696d2e5ffaa763c564682ec18c3b51b3e5fccc'

Merge only for metadata, functionality had been previously integrated.

* commit '9e696d2e5ffaa763c564682ec18c3b51b3e5fccc':
  h264: support frame parameter changes during frame-mt

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: use must_reinit to simplify code
Michael Niedermayer [Wed, 19 Dec 2012 20:39:14 +0000 (21:39 +0100)]
h264: use must_reinit to simplify code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: decode_update_thread_context() copy parameter sets before using them
Michael Niedermayer [Wed, 19 Dec 2012 20:38:39 +0000 (21:38 +0100)]
h264: decode_update_thread_context() copy parameter sets before using them

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: remove reschange blocking
Michael Niedermayer [Wed, 19 Dec 2012 19:11:41 +0000 (20:11 +0100)]
h264: remove reschange blocking

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: support frame size changes with multi threading
Michael Niedermayer [Wed, 19 Dec 2012 17:46:48 +0000 (18:46 +0100)]
h264: support frame size changes with multi threading

Based on code by Janne Grunau

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg_filter: use frame instead of decoder context pixel format
Michael Niedermayer [Wed, 19 Dec 2012 20:08:56 +0000 (21:08 +0100)]
ffmpeg_filter: use frame instead of decoder context pixel format

prevents regressions from h264-mt frame size changing code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg_filter: use frame dimensions instead of decoder context dimensions.
Michael Niedermayer [Wed, 19 Dec 2012 19:58:44 +0000 (20:58 +0100)]
ffmpeg_filter: use frame dimensions instead of decoder context dimensions.

avoids regression from the h264-mt frame size change code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: move h264_set_parameter_from_sps() call up
Michael Niedermayer [Wed, 19 Dec 2012 18:29:35 +0000 (19:29 +0100)]
h264: move h264_set_parameter_from_sps() call up

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: move list_count and current_slice reset to flush_change()
Michael Niedermayer [Wed, 19 Dec 2012 18:11:06 +0000 (19:11 +0100)]
h264: move list_count and current_slice reset to flush_change()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: split flush_change() out of flush_dpb()
Michael Niedermayer [Wed, 19 Dec 2012 16:33:45 +0000 (17:33 +0100)]
h264: split flush_change() out of flush_dpb()

Based on a patch by Janne Grunau
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: factor get_pixel_format() out
Michael Niedermayer [Wed, 19 Dec 2012 16:22:20 +0000 (17:22 +0100)]
h264: factor get_pixel_format() out

Based on patch by Janne Grunau

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoau: return meaningful error codes
Paul B Mahol [Wed, 19 Dec 2012 20:16:35 +0000 (20:16 +0000)]
au: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agopp: fix a few typo in the template.
Clément Bœsch [Wed, 19 Dec 2012 16:59:25 +0000 (17:59 +0100)]
pp: fix a few typo in the template.

6 years agopvfdec: drop pointless casting of buffer in ff_get_line()
Paul B Mahol [Wed, 19 Dec 2012 15:55:39 +0000 (15:55 +0000)]
pvfdec: drop pointless casting of buffer in ff_get_line()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoMerge commit 'f1d8763a02b5fce9a7d9789e049d74a45b15e1e8'
Michael Niedermayer [Wed, 19 Dec 2012 13:55:07 +0000 (14:55 +0100)]
Merge commit 'f1d8763a02b5fce9a7d9789e049d74a45b15e1e8'

* commit 'f1d8763a02b5fce9a7d9789e049d74a45b15e1e8':
  mpegvideo: allocate scratch buffers after linesize is known

Conflicts:
libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomov: handle h263 and flv1 for codec_tag 'H','2','6','3'
Janne Grunau [Wed, 19 Dec 2012 09:31:12 +0000 (10:31 +0100)]
mov: handle h263 and flv1 for codec_tag 'H','2','6','3'

The sample in https://bugzilla.libav.org/show_bug.cgi?id=393 and
samples/F4V/H263_NM_f.mp4 both have codec_tag H263 for different
codecs. H263 is apparently used by Flash Media Server for Sorensen
Spark videos.

Patch based on commit 5442083b1c541dd166b3adf39131259fc846a62b by
Carl Eugen Hoyos. Fixes bug 393.

6 years agoMerge commit 'ed2d7d5868a4a5d914f1e5488d63ea696a3b2937'
Michael Niedermayer [Wed, 19 Dec 2012 13:39:15 +0000 (14:39 +0100)]
Merge commit 'ed2d7d5868a4a5d914f1e5488d63ea696a3b2937'

* commit 'ed2d7d5868a4a5d914f1e5488d63ea696a3b2937':
  ff_h264_direct_ref_list_init: fix B slice check.
  h264: increase dist_scale_factor for up to 32 references

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534'
Michael Niedermayer [Wed, 19 Dec 2012 13:28:58 +0000 (14:28 +0100)]
Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534'

* commit '523c7bd23c781aa0f3a85044896f5e18e8b52534':
  misc typo, style and wording fixes

Conflicts:
libavcodec/options_table.h
libavutil/pixfmt.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: fix sps parsing for SVC and CAVLC 4:4:4 Intra profiles
Victor Lopez [Wed, 19 Dec 2012 08:12:24 +0000 (09:12 +0100)]
h264: fix sps parsing for SVC and CAVLC 4:4:4 Intra profiles

Fixes bug 396.

CC: libav-stable@libav.org
6 years agodoc: remove mention of fifo filter in the introduction.
Clément Bœsch [Wed, 19 Dec 2012 02:38:57 +0000 (03:38 +0100)]
doc: remove mention of fifo filter in the introduction.

It's confusing and not necessary, especially in the introduction.

6 years agolavfi/setpts: enable debug logs, and improve/extend debug messages
Stefano Sabatini [Tue, 18 Dec 2012 18:00:37 +0000 (19:00 +0100)]
lavfi/setpts: enable debug logs, and improve/extend debug messages

6 years agoShow underscores in av_get_codec_tag_string().
Carl Eugen Hoyos [Wed, 19 Dec 2012 09:01:07 +0000 (10:01 +0100)]
Show underscores in av_get_codec_tag_string().

6 years agodoc: extend "See Also" chapters in library manuals
Stefano Sabatini [Tue, 18 Dec 2012 00:22:16 +0000 (01:22 +0100)]
doc: extend "See Also" chapters in library manuals

In particular, make "See Also" chapter rendered in HTML output.

6 years agodoc: extend "See Also" chapters in component manuals
Stefano Sabatini [Mon, 17 Dec 2012 23:39:13 +0000 (00:39 +0100)]
doc: extend "See Also" chapters in component manuals

In particular, make "See Also" chapter rendered in HTML output.

6 years agodoc: extend "See Also" chapter rendering for ff* tools
Stefano Sabatini [Sun, 16 Dec 2012 19:53:16 +0000 (20:53 +0100)]
doc: extend "See Also" chapter rendering for ff* tools

Add more references, and generate alternative variants for HTML and POD
output. In particular, this allows to render a "See Also" chapter in the
HTML output.

6 years agodoc: rework synopsis section for ff* tools
Stefano Sabatini [Mon, 17 Dec 2012 11:55:28 +0000 (12:55 +0100)]
doc: rework synopsis section for ff* tools

Fix syntax, remove pointless introductory sentence, improve overall
consistency.

6 years agodoc: use a common authors.texi file blurb
Stefano Sabatini [Sun, 16 Dec 2012 17:04:37 +0000 (18:04 +0100)]
doc: use a common authors.texi file blurb

Factorize.

6 years agodoc/texi2pod: rework man inclusion logic
Stefano Sabatini [Sun, 16 Dec 2012 16:45:59 +0000 (17:45 +0100)]
doc/texi2pod: rework man inclusion logic

Ignore @c man begin ... @c man end comments, rely on @chapter for marking
the beginning of the various manual top level sections.

This allows us to write markup which is not dependent on the specific
texi2pod.pl implementation.

This change causes a few rendering issues, which will be fixed in further
patches.

6 years agompegvideo: increase edge_emu_buffer size for VC1
Janne Grunau [Tue, 18 Dec 2012 21:57:58 +0000 (22:57 +0100)]
mpegvideo: increase edge_emu_buffer size for VC1

The VC1 decoder uses edge_emu_buffer simultaneously for luma and chroma
and needs more space. That was not a problem before f1d8763a02b5fce
since the size for edge_emu_buffer was always calculated with 2 byte per
pixel since the linesize was not known.

Fixes occasionally fate errors in vc1_sa10143.

6 years agolavc: merge latest x86inc.asm fixes with x264
Ronald S. Bultje [Wed, 19 Dec 2012 01:02:31 +0000 (17:02 -0800)]
lavc: merge latest x86inc.asm fixes with x264

Unbreak NASM support.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoutils: fix duration calculation for strange_duration_example.ts
Michael Niedermayer [Wed, 19 Dec 2012 03:14:44 +0000 (04:14 +0100)]
utils: fix duration calculation for strange_duration_example.ts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/gradfun: small align cosmetics.
Clément Bœsch [Wed, 19 Dec 2012 02:22:58 +0000 (03:22 +0100)]
lavfi/gradfun: small align cosmetics.

6 years agodoc/filters: reformat and rework gradfun.
Clément Bœsch [Tue, 18 Dec 2012 21:19:34 +0000 (22:19 +0100)]
doc/filters: reformat and rework gradfun.

Note that examples are changed.

6 years agolavfi/gradfun: support named options.
Clément Bœsch [Tue, 18 Dec 2012 21:10:32 +0000 (22:10 +0100)]
lavfi/gradfun: support named options.

This breaks usage for out-of-range values.

6 years agofate: re-enable lavfi gradfun filter test.
Clément Bœsch [Thu, 6 Dec 2012 23:41:25 +0000 (00:41 +0100)]
fate: re-enable lavfi gradfun filter test.

6 years agolavfi/gradfun: reduce up limit for threshold.
Clément Bœsch [Tue, 18 Dec 2012 20:44:51 +0000 (21:44 +0100)]
lavfi/gradfun: reduce up limit for threshold.

This will prevent an overflow in the SSSE3 and MMX filter_line code:
delta is expressed as an u16 being shifted by 2 to the left. If it
overflows, having a strength not above 64 will make sure that m is set
to 0 (making the m*m*delta >> 14 expression void).

A value above 64 should not make any sense unless gradfun is used as a
blur filter.

6 years agolavfi/gradfun: remove rounding to match C and SSE code.
Clément Bœsch [Thu, 6 Dec 2012 23:41:04 +0000 (00:41 +0100)]
lavfi/gradfun: remove rounding to match C and SSE code.

There is no noticable benefit for such precision.

6 years agolavfi/gradfun: fix dithering in MMX code.
Clément Bœsch [Thu, 6 Dec 2012 23:39:31 +0000 (00:39 +0100)]
lavfi/gradfun: fix dithering in MMX code.

Current dithering only use the first 4w instead of the whole 8 random values.

6 years agolavfi/gradfun: fix rounding in MMX code.
Clément Bœsch [Thu, 6 Dec 2012 23:36:29 +0000 (00:36 +0100)]
lavfi/gradfun: fix rounding in MMX code.

Current code divide before increasing precision.

6 years agolavfi/gradfun: do not increment DC pointer for odd values.
Clément Bœsch [Wed, 5 Dec 2012 03:58:03 +0000 (04:58 +0100)]
lavfi/gradfun: do not increment DC pointer for odd values.

First DC is only used once otherwise. This also makes the code
consistent with ASM versions.

6 years agoqcelpdata: correct start bit for cbgain[0] in qcelp_rate_octave_bitmap[]
Paul B Mahol [Mon, 17 Dec 2012 20:58:23 +0000 (20:58 +0000)]
qcelpdata: correct start bit for cbgain[0] in qcelp_rate_octave_bitmap[]

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoffmpeg: Fix shortest with libx264
Michael Niedermayer [Tue, 18 Dec 2012 23:08:37 +0000 (00:08 +0100)]
ffmpeg: Fix shortest with libx264

Encoders that buffer a significant number of frames where a "few"
frames off with -shortest

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMAINTAINERS: update my GPG key fingerprint
Stefano Sabatini [Tue, 18 Dec 2012 22:07:17 +0000 (23:07 +0100)]
MAINTAINERS: update my GPG key fingerprint

6 years agoCosmetics: Reindent after last commit.
Carl Eugen Hoyos [Tue, 18 Dec 2012 22:06:00 +0000 (23:06 +0100)]
Cosmetics: Reindent after last commit.

6 years agoDo not skip three bytes and don't search for extradata in old realaudio files.
Carl Eugen Hoyos [Tue, 18 Dec 2012 22:04:19 +0000 (23:04 +0100)]
Do not skip three bytes and don't search for extradata in old realaudio files.

Fixes ticket #1557.

6 years agoavcodec: bump minor for adaptive h264 frame-mt
Janne Grunau [Tue, 18 Dec 2012 19:11:28 +0000 (20:11 +0100)]
avcodec: bump minor for adaptive h264 frame-mt

Also adds forgotten Changelog entry.

6 years agoavconv: pass the actually selected decoder to filter_codec_opts().
Anton Khirnov [Sat, 15 Dec 2012 10:45:59 +0000 (11:45 +0100)]
avconv: pass the actually selected decoder to filter_codec_opts().

6 years agoavconv: use new options parser.
Anton Khirnov [Fri, 8 Jun 2012 19:35:16 +0000 (21:35 +0200)]
avconv: use new options parser.

6 years agocmdutils: don't log an error in opt_default().
Anton Khirnov [Mon, 11 Jun 2012 08:18:51 +0000 (10:18 +0200)]
cmdutils: don't log an error in opt_default().

It results in spurious errors when using the new preparser.

6 years agocmdutils: add a commandline pre-parser.
Anton Khirnov [Sun, 10 Jun 2012 18:46:30 +0000 (20:46 +0200)]
cmdutils: add a commandline pre-parser.

It splits the commandline into a more convenient internal representation
for further parsing.

This will allow e.g.
- processing global options first independently of their location on the
  commandline, eliminating ugly hacks for processing e.g. cpuflags
  first
- better options validation and error reporting. It is now possible for
  the parser to know that it's applying an input option to an output
  file or vice versa and act accordingly.

6 years agocmdutils: split parse_option().
Anton Khirnov [Sun, 10 Jun 2012 15:57:52 +0000 (17:57 +0200)]
cmdutils: split parse_option().

Separate the code that searches for the option to use and the code that
actually writes it. The writing code will be reused by the new options
parser.

6 years agocmdutils: add a macro to simplify grow_array() calls.
Anton Khirnov [Thu, 7 Jun 2012 19:52:07 +0000 (21:52 +0200)]
cmdutils: add a macro to simplify grow_array() calls.

6 years agoh264: support frame parameter changes during frame-mt
Janne Grunau [Thu, 6 Sep 2012 11:30:08 +0000 (13:30 +0200)]
h264: support frame parameter changes during frame-mt

Fixes CVE-2012-2782.

6 years agompegvideo: allocate scratch buffers after linesize is known
Janne Grunau [Sun, 25 Nov 2012 21:42:07 +0000 (22:42 +0100)]
mpegvideo: allocate scratch buffers after linesize is known

Since we can't know which stride a custom get_buffer() implementation is
going to use we have to allocate this scratch buffers after the linesize
is known. It was pretty safe for 8 bit per pixel pixel formats since we
always allocated memory for up to 16 bits per pixel. It broke hoever
with cmdutis.c's alloc_buffer() and high pixel bit depth since it
allocated larger edges than mpegvideo expected.

Fixes fuzzed sample nasa-8s2.ts_s244342.

6 years agoff_h264_direct_ref_list_init: fix B slice check.
Michael Niedermayer [Sun, 18 Nov 2012 17:46:05 +0000 (18:46 +0100)]
ff_h264_direct_ref_list_init: fix B slice check.

Fixes null pointer dereference.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
6 years agoh264: increase dist_scale_factor for up to 32 references
Janne Grunau [Mon, 17 Dec 2012 20:36:05 +0000 (21:36 +0100)]
h264: increase dist_scale_factor for up to 32 references

Compute dist_scale_factor_field only for MBAFF since that is the only
case in which it is used.

6 years agoaf_apad: remove unneeded av_opt_free
Michael Niedermayer [Tue, 18 Dec 2012 16:31:01 +0000 (17:31 +0100)]
af_apad: remove unneeded av_opt_free

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoapad: add whole_len and pad_len options.
Michael Niedermayer [Tue, 18 Dec 2012 16:22:36 +0000 (17:22 +0100)]
apad: add whole_len and pad_len options.

These options allow padding to a specific length or adding a specific amount if silence.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoapad: fix apad_options formating
Michael Niedermayer [Tue, 18 Dec 2012 16:16:03 +0000 (17:16 +0100)]
apad: fix apad_options formating

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoaf_apad: add user setable packet_size
Michael Niedermayer [Tue, 18 Dec 2012 16:01:33 +0000 (17:01 +0100)]
af_apad: add user setable packet_size

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter: add apad filter
Michael Niedermayer [Tue, 18 Dec 2012 04:13:59 +0000 (05:13 +0100)]
avfilter: add apad filter

This filter pads an audio stream with silence
It can together with -shortest be used to extend audio streams to
the same length as video.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 18 Dec 2012 14:00:05 +0000 (15:00 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: formatting cosmetics
  h264: use mbaff ref indices in fill_colmap() only for mbaff references

Conflicts:
libavcodec/h264_direct.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: remove redundant parts of old slice in extradata code.
Michael Niedermayer [Tue, 18 Dec 2012 13:52:44 +0000 (14:52 +0100)]
h264: remove redundant parts of old slice in extradata code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: merge old and new "slice in extradata" checks
Michael Niedermayer [Tue, 18 Dec 2012 13:50:12 +0000 (14:50 +0100)]
h264: merge old and new "slice in extradata" checks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '61c6eef5456f2bc8b1dc49a0a759c975551cea29'
Michael Niedermayer [Tue, 18 Dec 2012 13:38:10 +0000 (14:38 +0100)]
Merge commit '61c6eef5456f2bc8b1dc49a0a759c975551cea29'

* commit '61c6eef5456f2bc8b1dc49a0a759c975551cea29':
  h264: prevent decoding of slice NALs in extradata
  doxy: Clarify what avpriv_set_pts_info does

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a'
Michael Niedermayer [Tue, 18 Dec 2012 13:27:59 +0000 (14:27 +0100)]
Merge commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a'

* commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a':
  au: Reorder code so that both muxer and demuxer are under #ifdefs
  fate: Move RALF test into lossless audio group
  cosmetics: Use consistent names for multiple inclusion guards.

Conflicts:
libavformat/au.c
tests/fate/lossless-audio.mak
tests/fate/real.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowtv: permit root table and first sectors to be located beyond 2GB boundary
Peter Ross [Mon, 17 Dec 2012 13:42:13 +0000 (00:42 +1100)]
wtv: permit root table and first sectors to be located beyond 2GB boundary

Fixes ticket #2025.

Signed-off-by: Peter Ross <pross@xvid.org>
6 years agonutdec: sanity check r_frame_rate
Michael Niedermayer [Tue, 18 Dec 2012 03:05:44 +0000 (04:05 +0100)]
nutdec: sanity check r_frame_rate

This fixes files that store a somewhat incorrect value.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomisc typo, style and wording fixes
Diego Biurrun [Fri, 7 Dec 2012 15:07:51 +0000 (16:07 +0100)]
misc typo, style and wording fixes

6 years agoconfigure: formatting cosmetics
Diego Biurrun [Sun, 2 Dec 2012 22:32:41 +0000 (23:32 +0100)]
configure: formatting cosmetics

6 years agoh264: use mbaff ref indices in fill_colmap() only for mbaff references
Michael Niedermayer [Thu, 6 Oct 2011 20:54:00 +0000 (22:54 +0200)]
h264: use mbaff ref indices in fill_colmap() only for mbaff references

Prevents writing beyond array bounds.

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
6 years agoh264: prevent decoding of slice NALs in extradata
Janne Grunau [Sat, 15 Dec 2012 21:21:23 +0000 (22:21 +0100)]
h264: prevent decoding of slice NALs in extradata

It is not posible to call get_buffer during frame-mt codec
initialization. Libavformat might pass huge amounts of data as
extradata after parsing broken files. The 'extradata' for the fuzzed
sample sample_varPAR_s5374_r001-02.avi is 2.8M large and contains
multiple slices.

6 years agoFix "bistream" typo and add a check in tools/patcheck.
Clément Bœsch [Tue, 18 Dec 2012 01:46:42 +0000 (02:46 +0100)]
Fix "bistream" typo and add a check in tools/patcheck.

6 years agodoc/ffmpeg-bitstream-filters: fix typo in title
Stefano Sabatini [Tue, 18 Dec 2012 00:59:22 +0000 (01:59 +0100)]
doc/ffmpeg-bitstream-filters: fix typo in title

6 years agoFix typo in mvc decoder.
Carl Eugen Hoyos [Tue, 18 Dec 2012 00:58:17 +0000 (01:58 +0100)]
Fix typo in mvc decoder.

6 years agomjpegenc: fix restart interval parameters for yuv444
Michael Niedermayer [Tue, 18 Dec 2012 00:11:02 +0000 (01:11 +0100)]
mjpegenc: fix restart interval parameters for yuv444

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomjpegenc: fix YUV444 with w%16!=0
Michael Niedermayer [Mon, 17 Dec 2012 23:46:31 +0000 (00:46 +0100)]
mjpegenc: fix YUV444 with w%16!=0

Fixes Ticket2040

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/indevs: update syntax for the color filter in the lavfi device examples
Stefano Sabatini [Mon, 17 Dec 2012 15:33:00 +0000 (16:33 +0100)]
doc/indevs: update syntax for the color filter in the lavfi device examples

6 years agodoc/texi2pod: correctly handle @url commands in the form @url{URL,...}
Stefano Sabatini [Mon, 17 Dec 2012 13:29:17 +0000 (14:29 +0100)]
doc/texi2pod: correctly handle @url commands in the form @url{URL,...}

Ignore the other arguments, which have not to be processed by the POD
renderer.

6 years agodoc/Makefile: add docclean rule
Stefano Sabatini [Mon, 17 Dec 2012 12:39:53 +0000 (13:39 +0100)]
doc/Makefile: add docclean rule

This allows to clean the doc directory from the parent project dir.
The command:
make -C doc clean

does not work as long as the paths specified in doc/Makefile are relative
to the parent dir.

Also it is consitent with "testclean" and "distclean" targets.