ffmpeg.git
7 years agoMerge commit 'f337c29017b10c98ccb4dce20efced4c74b665f6'
Michael Niedermayer [Sat, 26 Jan 2013 13:47:08 +0000 (14:47 +0100)]
Merge commit 'f337c29017b10c98ccb4dce20efced4c74b665f6'

* commit 'f337c29017b10c98ccb4dce20efced4c74b665f6':
  eatgq: return meaningful error codes.
  eatgv: cosmetics, reformat

Conflicts:
libavcodec/eatgq.c
libavcodec/eatgv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'ade402804a0e811cd00862c90559121a793054a6'
Michael Niedermayer [Sat, 26 Jan 2013 13:39:02 +0000 (14:39 +0100)]
Merge commit 'ade402804a0e811cd00862c90559121a793054a6'

* commit 'ade402804a0e811cd00862c90559121a793054a6':
  eatgv: return meaningful error codes.
  cyuv: return meaningful error codes.
  txd: return meaningful error codes.

Conflicts:
libavcodec/cyuv.c
libavcodec/eatgv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '69c25c9284645cf5189af2ede42d6f53828f3b45'
Michael Niedermayer [Sat, 26 Jan 2013 13:33:06 +0000 (14:33 +0100)]
Merge commit '69c25c9284645cf5189af2ede42d6f53828f3b45'

* commit '69c25c9284645cf5189af2ede42d6f53828f3b45':
  dnxhdenc: fix invalid reads in dnxhd_mb_var_thread().
  x86: h264qpel: Move stray comment to the right spot and clarify it
  atrac3: use correct loop variable in add_tonal_components()

Conflicts:
tests/ref/vsynth/vsynth1-dnxhd-1080i
tests/ref/vsynth/vsynth2-dnxhd-1080i

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'ded3673d77943c376d94e8157b1238bbd1eeca2d'
Michael Niedermayer [Sat, 26 Jan 2013 13:18:48 +0000 (14:18 +0100)]
Merge commit 'ded3673d77943c376d94e8157b1238bbd1eeca2d'

* commit 'ded3673d77943c376d94e8157b1238bbd1eeca2d':
  doc: document libx264 options and mappings
  libx264: introduce -x264-params private option

Conflicts:
doc/encoders.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '38c1466ca41c73c7ce347da702362cb69c151716'
Michael Niedermayer [Sat, 26 Jan 2013 12:34:30 +0000 (13:34 +0100)]
Merge commit '38c1466ca41c73c7ce347da702362cb69c151716'

* commit '38c1466ca41c73c7ce347da702362cb69c151716':
  dict: add av_dict_parse_string()
  doc: support multitable in texi2pod

Conflicts:
doc/APIchanges
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc/iff: ilbm: unbreak decoding on big endian
Paul B Mahol [Sat, 26 Jan 2013 11:58:36 +0000 (11:58 +0000)]
lavc/iff: ilbm: unbreak decoding on big endian

Fixes #2192.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoeatgq: return meaningful error codes.
Anton Khirnov [Wed, 21 Nov 2012 18:20:21 +0000 (19:20 +0100)]
eatgq: return meaningful error codes.

7 years agoeatgv: cosmetics, reformat
Anton Khirnov [Wed, 21 Nov 2012 13:52:54 +0000 (14:52 +0100)]
eatgv: cosmetics, reformat

7 years agoeatgv: return meaningful error codes.
Anton Khirnov [Wed, 21 Nov 2012 09:26:55 +0000 (10:26 +0100)]
eatgv: return meaningful error codes.

7 years agocyuv: return meaningful error codes.
Anton Khirnov [Tue, 20 Nov 2012 11:10:13 +0000 (12:10 +0100)]
cyuv: return meaningful error codes.

7 years agotxd: return meaningful error codes.
Anton Khirnov [Tue, 20 Nov 2012 06:48:01 +0000 (07:48 +0100)]
txd: return meaningful error codes.

7 years agolavfi/vf_drawtext: default to expansion=normal.
Nicolas George [Thu, 17 Jan 2013 11:17:35 +0000 (12:17 +0100)]
lavfi/vf_drawtext: default to expansion=normal.

7 years agodnxhdenc: fix invalid reads in dnxhd_mb_var_thread().
Anton Khirnov [Tue, 22 Jan 2013 10:55:54 +0000 (11:55 +0100)]
dnxhdenc: fix invalid reads in dnxhd_mb_var_thread().

Do not assume that frame dimensions are mod16 (or that height is mod32
for interlaced).

CC:libav-stable@libav.org

7 years agofate: add an attachment to the Matroska test.
Nicolas George [Tue, 1 Jan 2013 11:08:32 +0000 (12:08 +0100)]
fate: add an attachment to the Matroska test.

7 years agolavfi: version bump and change log entries after the last commits.
Nicolas George [Sat, 26 Jan 2013 10:25:21 +0000 (11:25 +0100)]
lavfi: version bump and change log entries after the last commits.

7 years agox86: h264qpel: Move stray comment to the right spot and clarify it
Diego Biurrun [Thu, 24 Jan 2013 16:01:32 +0000 (17:01 +0100)]
x86: h264qpel: Move stray comment to the right spot and clarify it

7 years agoffmpeg: support filtering of unknown channel layouts.
Nicolas George [Wed, 26 Dec 2012 15:53:02 +0000 (16:53 +0100)]
ffmpeg: support filtering of unknown channel layouts.

7 years agolavfi/af_anull: accept unknown channel layouts.
Nicolas George [Wed, 26 Dec 2012 15:52:15 +0000 (16:52 +0100)]
lavfi/af_anull: accept unknown channel layouts.

7 years agolavfi/af_aresample: accept unknown channel layouts.
Nicolas George [Wed, 26 Dec 2012 15:51:50 +0000 (16:51 +0100)]
lavfi/af_aresample: accept unknown channel layouts.

7 years agolavfi/af_aformat: accept unknown channel layouts.
Nicolas George [Wed, 26 Dec 2012 15:51:26 +0000 (16:51 +0100)]
lavfi/af_aformat: accept unknown channel layouts.

7 years agolavfi/buffersrc: accept unknown channel layouts.
Nicolas George [Wed, 26 Dec 2012 15:50:57 +0000 (16:50 +0100)]
lavfi/buffersrc: accept unknown channel layouts.

7 years agolavfi/sink_buffer: accept unknown channel layouts.
Nicolas George [Wed, 26 Dec 2012 15:49:16 +0000 (16:49 +0100)]
lavfi/sink_buffer: accept unknown channel layouts.

Add a field to the AVBufferSinkParams for a list of accepted
channel counts.
Change the default value for the lists in AVBufferSinkParams
to NULL, to let lavfi fill them with something useful.
The fail_enomem path is unneeded because filters are uninited
on failure.

7 years agolavfi: implement ff_query_formats_all().
Nicolas George [Wed, 26 Dec 2012 15:47:18 +0000 (16:47 +0100)]
lavfi: implement ff_query_formats_all().

7 years agolavfi: implement ff_all_channel_counts().
Nicolas George [Wed, 26 Dec 2012 15:46:43 +0000 (16:46 +0100)]
lavfi: implement ff_all_channel_counts().

7 years agolavfi: support unknown channel layouts.
Nicolas George [Wed, 2 Jan 2013 14:11:30 +0000 (15:11 +0100)]
lavfi: support unknown channel layouts.

7 years agoffmpeg: add -guess_layout_max option.
Nicolas George [Mon, 31 Dec 2012 14:20:25 +0000 (15:20 +0100)]
ffmpeg: add -guess_layout_max option.

7 years agolavc/gif: remove some obsolete/irrelevant chunks
Paul B Mahol [Fri, 25 Jan 2013 17:05:29 +0000 (17:05 +0000)]
lavc/gif: remove some obsolete/irrelevant chunks

Some code was copy pasted from muxer, which still
have same comments but unlike encoder they are still
relevant to muxer.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavf/gifdec: cosmetics: remove extra whitespace
Paul B Mahol [Fri, 25 Jan 2013 16:41:51 +0000 (16:41 +0000)]
lavf/gifdec: cosmetics: remove extra whitespace

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavf/gifdec: fix typo
Paul B Mahol [Fri, 25 Jan 2013 16:37:03 +0000 (16:37 +0000)]
lavf/gifdec: fix typo

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agosws: GBRP9, GBRP10 GBRP12 GBRP14 output support
Michael Niedermayer [Fri, 25 Jan 2013 22:05:48 +0000 (23:05 +0100)]
sws: GBRP9, GBRP10 GBRP12 GBRP14 output support

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws: GBRP output support
Michael Niedermayer [Fri, 25 Jan 2013 20:51:25 +0000 (21:51 +0100)]
sws: GBRP output support

Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoatrac3: fix buffer size for get_bits.
Michael Niedermayer [Sat, 26 Jan 2013 03:27:23 +0000 (04:27 +0100)]
atrac3: fix buffer size for get_bits.

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoindeo4: check for invalid transform_size blk_size combinations
Michael Niedermayer [Sat, 26 Jan 2013 02:17:19 +0000 (03:17 +0100)]
indeo4: check for invalid transform_size blk_size combinations

The checks existing previously where not sufficient
Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years ago4xm: remove avcodec_get_frame_defaults() calls
Michael Niedermayer [Sat, 26 Jan 2013 01:07:44 +0000 (02:07 +0100)]
4xm: remove avcodec_get_frame_defaults() calls

They are not needed anymore

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years ago4xm: add assert to check that the pointer from read_huffman_tables is within the...
Michael Niedermayer [Sat, 26 Jan 2013 01:05:32 +0000 (02:05 +0100)]
4xm: add assert to check that the pointer from read_huffman_tables is within the array

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years ago4xm: Check available space in read_huffman_tables()
Michael Niedermayer [Sat, 26 Jan 2013 01:03:05 +0000 (02:03 +0100)]
4xm: Check available space in read_huffman_tables()

Fixes integer overflow and out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix atrac3 decoder broken in e55d53905f34f8e8747f6d321e9a695dc02ebb2f
Michael Karcher [Fri, 25 Jan 2013 19:44:50 +0000 (20:44 +0100)]
Fix atrac3 decoder broken in e55d53905f34f8e8747f6d321e9a695dc02ebb2f

Signed-off-by: Michael Karcher <ffmpeg@mkarcher.dialup.fu-berlin.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffv1enc: fix gbrp>8bit
Michael Niedermayer [Fri, 25 Jan 2013 22:09:59 +0000 (23:09 +0100)]
ffv1enc: fix gbrp>8bit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoatrac3: use correct loop variable in add_tonal_components()
Michael Karcher [Fri, 25 Jan 2013 20:03:53 +0000 (15:03 -0500)]
atrac3: use correct loop variable in add_tonal_components()

Signed-off-by: Michael Karcher <ffmpeg@mkarcher.dialup.fu-berlin.de>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
CC:libav-stable@libav.org

7 years agolavfi/showwaves: fail in case of push_frame() error
Stefano Sabatini [Tue, 22 Jan 2013 20:11:23 +0000 (21:11 +0100)]
lavfi/showwaves: fail in case of push_frame() error

7 years agodoc/filters: apply minor fixes
Stefano Sabatini [Fri, 25 Jan 2013 16:45:27 +0000 (17:45 +0100)]
doc/filters: apply minor fixes

7 years agolavfi/showwaves: add display mode option and mode=line
Stefano Sabatini [Tue, 22 Jan 2013 11:11:36 +0000 (12:11 +0100)]
lavfi/showwaves: add display mode option and mode=line

7 years agogifdec: resync support
Michael Niedermayer [Mon, 21 Jan 2013 17:52:01 +0000 (18:52 +0100)]
gifdec: resync support

This allows decoding gifs that have junk at the begin
and also allows byte wise seeking

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc: document libx264 options and mappings
Luca Barbato [Wed, 23 Jan 2013 07:28:47 +0000 (08:28 +0100)]
doc: document libx264 options and mappings

7 years agodict: add av_dict_parse_string()
Justin Ruggles [Wed, 2 Jan 2013 21:04:23 +0000 (21:04 +0000)]
dict: add av_dict_parse_string()

Can be used to set multiple key/value pairs from a string.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agolibx264: introduce -x264-params private option
Gavriloaie Eugen-Andrei [Wed, 23 Jan 2013 07:21:55 +0000 (08:21 +0100)]
libx264: introduce -x264-params private option

It is a shortcut to set all the params using x264_param_parse,
makes simpler importing settings from other software using x264.

7 years agolavc/dnxhddata: fix bitrates for cid 1251 and 1252 in cid table
Matthieu Bouron [Mon, 21 Jan 2013 20:14:13 +0000 (21:14 +0100)]
lavc/dnxhddata: fix bitrates for cid 1251 and 1252 in cid table

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosetpts: deprecate RTCTIME, we have time(0) which is more generic
Michael Niedermayer [Fri, 25 Jan 2013 14:14:33 +0000 (15:14 +0100)]
setpts: deprecate RTCTIME, we have time(0) which is more generic

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 25 Jan 2013 14:04:41 +0000 (15:04 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avfilter: allow setpts filter to use wallclock time for calculations

Conflicts:
doc/filters.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'b85a5e87af4254b80913fe33591d96361f30832b'
Michael Niedermayer [Fri, 25 Jan 2013 13:36:45 +0000 (14:36 +0100)]
Merge commit 'b85a5e87af4254b80913fe33591d96361f30832b'

* commit 'b85a5e87af4254b80913fe33591d96361f30832b':
  lavu: Add av_strnstr()
  h264: Allow discarding the cropping information from SPS

Conflicts:
Changelog
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '33552a5f7b6ec7057516f487b1a902331f8c353e'
Michael Niedermayer [Fri, 25 Jan 2013 13:24:38 +0000 (14:24 +0100)]
Merge commit '33552a5f7b6ec7057516f487b1a902331f8c353e'

* commit '33552a5f7b6ec7057516f487b1a902331f8c353e':
  arm: Add mathops.h to ARCH_HEADERS list
  avstring: K&R formatting cosmetics

Conflicts:
libavutil/avstring.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '2c10e2a2f62477efaef5b641974594f7df4ca339'
Michael Niedermayer [Fri, 25 Jan 2013 13:14:21 +0000 (14:14 +0100)]
Merge commit '2c10e2a2f62477efaef5b641974594f7df4ca339'

* commit '2c10e2a2f62477efaef5b641974594f7df4ca339':
  build: Make the H.264 parser select h264qpel
  x86: h264qpel: add cpu flag checks for init function

Conflicts:
libavcodec/x86/h264_qpel.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoswscale: check flags instead of nb_components to find if pixel format have alpha
Paul B Mahol [Thu, 24 Jan 2013 17:32:37 +0000 (17:32 +0000)]
swscale: check flags instead of nb_components to find if pixel format have alpha

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agodoc: support multitable in texi2pod
Luca Barbato [Wed, 23 Jan 2013 10:43:37 +0000 (11:43 +0100)]
doc: support multitable in texi2pod

7 years agolavc/gifdec: remove obsolete check
Paul B Mahol [Fri, 25 Jan 2013 12:50:11 +0000 (12:50 +0000)]
lavc/gifdec: remove obsolete check

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavc/gifdec: move idx_line allocation out of gif_read_header1()
Paul B Mahol [Fri, 25 Jan 2013 12:46:57 +0000 (12:46 +0000)]
lavc/gifdec: move idx_line allocation out of gif_read_header1()

Now allocation is done only if av_image_check_size() passes.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavc/gifdec: do not return nonzero *got_frame if frame is not passed
Paul B Mahol [Fri, 25 Jan 2013 12:15:13 +0000 (12:15 +0000)]
lavc/gifdec: do not return nonzero *got_frame if frame is not passed

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavc/gifdec: simplify "!= 0" checks
Paul B Mahol [Fri, 25 Jan 2013 12:13:17 +0000 (12:13 +0000)]
lavc/gifdec: simplify "!= 0" checks

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavc/gifdec: use memcpy()
Paul B Mahol [Fri, 25 Jan 2013 11:51:16 +0000 (11:51 +0000)]
lavc/gifdec: use memcpy()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge commit '6bdb841b46d170d58488deaed720729b79223b1d'
Michael Niedermayer [Fri, 25 Jan 2013 12:41:53 +0000 (13:41 +0100)]
Merge commit '6bdb841b46d170d58488deaed720729b79223b1d'

* commit '6bdb841b46d170d58488deaed720729b79223b1d':
  arm: h264qpel: use neon h264 qpel functions only if supported

* bug was fixed previously (in merge of buggy code):
  h264: copy h264qpel dsp context to slice thread copies

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavfilter: allow setpts filter to use wallclock time for calculations
Vladimir Pantelic [Wed, 23 Jan 2013 12:54:08 +0000 (13:54 +0100)]
avfilter: allow setpts filter to use wallclock time for calculations

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agolavu: Add av_strnstr()
Vladimir Pantelic [Thu, 24 Jan 2013 14:09:48 +0000 (14:09 +0000)]
lavu: Add av_strnstr()

This is a length limited version of strstr()

Signed-off-by: Vladimir Pantelic <vladoman@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agoh264: Allow discarding the cropping information from SPS
Vittorio Giovara [Wed, 23 Jan 2013 11:26:59 +0000 (12:26 +0100)]
h264: Allow discarding the cropping information from SPS

Some 3D systems overload the meaning of the field for other purposes.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agovqavideo: check chunk sizes before reading chunks
Michael Niedermayer [Fri, 25 Jan 2013 05:11:59 +0000 (06:11 +0100)]
vqavideo: check chunk sizes before reading chunks

Fixes out of array writes

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoeacmv: Free frames on resolution changes
Michael Niedermayer [Thu, 24 Jan 2013 23:41:16 +0000 (00:41 +0100)]
eacmv: Free frames on resolution changes

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agogifdec: check that w,h is not zero
Michael Niedermayer [Thu, 24 Jan 2013 23:03:59 +0000 (00:03 +0100)]
gifdec: check that w,h is not zero

Fixes out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix compilation with --disable-everything on x86_32.
Carl Eugen Hoyos [Fri, 25 Jan 2013 02:04:46 +0000 (03:04 +0100)]
Fix compilation with --disable-everything on x86_32.

Fixes ticket #2183.

7 years agoffmpeg: fix typo in open_files() message
Stefano Sabatini [Thu, 24 Jan 2013 23:44:28 +0000 (00:44 +0100)]
ffmpeg: fix typo in open_files() message

Found-By: Justin Ruggles
7 years agolavf/img2enc: extend current options documentation
Stefano Sabatini [Thu, 24 Jan 2013 15:37:49 +0000 (16:37 +0100)]
lavf/img2enc: extend current options documentation

7 years agolavf/img2dec: fix option help fields
Stefano Sabatini [Thu, 24 Jan 2013 14:28:07 +0000 (15:28 +0100)]
lavf/img2dec: fix option help fields

7 years agodoc/faq: fill missing word in the concat protocol entry
Stefano Sabatini [Thu, 24 Jan 2013 13:04:59 +0000 (14:04 +0100)]
doc/faq: fill missing word in the concat protocol entry

7 years agodoc/faq: mention concat protocol documentation in the protocol concatenation entry
Stefano Sabatini [Thu, 24 Jan 2013 13:03:46 +0000 (14:03 +0100)]
doc/faq: mention concat protocol documentation in the protocol concatenation entry

7 years agogifdec: gif_copy_img_rect: Fix end pointer
Michael Niedermayer [Thu, 24 Jan 2013 22:11:10 +0000 (23:11 +0100)]
gifdec: gif_copy_img_rect: Fix end pointer

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264_qpel: put cpuflags checks back.
Michael Niedermayer [Thu, 24 Jan 2013 21:14:39 +0000 (22:14 +0100)]
h264_qpel: put cpuflags checks back.

These where lost when libav moved the code out of dsputil

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocavsdec: check for value in get_ue_code()
Michael Niedermayer [Thu, 24 Jan 2013 20:55:12 +0000 (21:55 +0100)]
cavsdec: check for value in get_ue_code()

Fixes integer overflow and prints an error in case the value is
invalid.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu/timecode: fix time code calculation for 60000/1001 drop frame
Jason [Tue, 22 Jan 2013 19:47:58 +0000 (14:47 -0500)]
lavu/timecode: fix time code calculation for 60000/1001 drop frame

Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu/timecode: Allow drop frame mode for 60000/1001 fps
Jason [Tue, 22 Jan 2013 17:31:46 +0000 (12:31 -0500)]
lavu/timecode: Allow drop frame mode for 60000/1001 fps

Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoarm: Add mathops.h to ARCH_HEADERS list
Diego Biurrun [Mon, 21 Jan 2013 09:16:03 +0000 (10:16 +0100)]
arm: Add mathops.h to ARCH_HEADERS list

It is an arch-specific header not suitable for standalone compilation.

7 years agoavstring: K&R formatting cosmetics
Luca Barbato [Thu, 24 Jan 2013 18:00:57 +0000 (19:00 +0100)]
avstring: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agobuild: Make the H.264 parser select h264qpel
Diego Biurrun [Thu, 24 Jan 2013 16:47:03 +0000 (17:47 +0100)]
build: Make the H.264 parser select h264qpel

It is required for building the shared H.264 code.

7 years agox86: h264qpel: add cpu flag checks for init function
Janne Grunau [Thu, 24 Jan 2013 17:39:10 +0000 (18:39 +0100)]
x86: h264qpel: add cpu flag checks for init function

The code was copied from per cpu extension init function so the checks
for supported extensions was overlooked.

7 years agomovenc: check that fps for tmcd is within encodable range.
Michael Niedermayer [Thu, 17 Jan 2013 17:52:35 +0000 (18:52 +0100)]
movenc: check that fps for tmcd is within encodable range.

The fps is stored as a 8 bit value thus 255 is the maximum encodable.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomovenc: Calculate fps for tmcd without intermediate step.
Michael Niedermayer [Thu, 17 Jan 2013 17:51:49 +0000 (18:51 +0100)]
movenc: Calculate fps for tmcd without intermediate step.

Fixes part of Ticket2045

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: copy tmcd track timebase parameters
Michael Niedermayer [Thu, 17 Jan 2013 17:49:46 +0000 (18:49 +0100)]
ffmpeg: copy tmcd track timebase parameters

Fixes part of Ticket2045

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc: include timebase in avcodec string at debug level.
Michael Niedermayer [Thu, 17 Jan 2013 17:51:04 +0000 (18:51 +0100)]
lavc: include timebase in avcodec string at debug level.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompeg12demux: Fallback to startcode for stream type identification.
Michael Niedermayer [Mon, 21 Jan 2013 03:21:56 +0000 (04:21 +0100)]
mpeg12demux: Fallback to startcode for stream type identification.

Fixes Ticket2147
Fixes SageTV support

Based-on patch by Andrew Gallatin
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: copy h264qpel dsp context to slice thread copies
Janne Grunau [Thu, 24 Jan 2013 15:56:07 +0000 (16:56 +0100)]
h264: copy h264qpel dsp context to slice thread copies

7 years agoarm: h264qpel: use neon h264 qpel functions only if supported
Janne Grunau [Thu, 24 Jan 2013 15:45:45 +0000 (16:45 +0100)]
arm: h264qpel: use neon h264 qpel functions only if supported

7 years agoeacdata: do not set sample_fmt
Paul B Mahol [Thu, 24 Jan 2013 12:41:32 +0000 (12:41 +0000)]
eacdata: do not set sample_fmt

It is supposed to be set from lavc only.
Also this one differs from one set in decoder.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoflic: do not set sample_fmt
Paul B Mahol [Thu, 24 Jan 2013 12:37:29 +0000 (12:37 +0000)]
flic: do not set sample_fmt

It is supposed to be set from lavc only.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 24 Jan 2013 13:44:34 +0000 (14:44 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dsputil: Separate h264 qpel

Conflicts:
libavcodec/dsputil_template.c
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '7a95afe433b2a692f490b98948c082e62ffc1d27'
Michael Niedermayer [Thu, 24 Jan 2013 13:34:35 +0000 (14:34 +0100)]
Merge commit '7a95afe433b2a692f490b98948c082e62ffc1d27'

* commit '7a95afe433b2a692f490b98948c082e62ffc1d27':
  doc: fix dependencies in pod generation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '528878ee7b377e23a194d7c801571d97793047e0'
Michael Niedermayer [Thu, 24 Jan 2013 13:29:29 +0000 (14:29 +0100)]
Merge commit '528878ee7b377e23a194d7c801571d97793047e0'

* commit '528878ee7b377e23a194d7c801571d97793047e0':
  openbsd: configure: Stop enabling PIC by default

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '4a4a7e138c92901e04db46a6b05cc6948023e5f5'
Michael Niedermayer [Thu, 24 Jan 2013 13:18:25 +0000 (14:18 +0100)]
Merge commit '4a4a7e138c92901e04db46a6b05cc6948023e5f5'

* commit '4a4a7e138c92901e04db46a6b05cc6948023e5f5':
  rtpenc_chain: Use the original AVFormatContext for getting payload type
  rtp: Make sure the output format pointer is set

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agowmv2enc: drop setting of idct_algo
Michael Niedermayer [Thu, 24 Jan 2013 13:06:48 +0000 (14:06 +0100)]
wmv2enc: drop setting of idct_algo

This should have become redundant

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '57ed8debb9b9cc565cc6e9f98c5b5cbb9f69097c'
Michael Niedermayer [Thu, 24 Jan 2013 13:04:11 +0000 (14:04 +0100)]
Merge commit '57ed8debb9b9cc565cc6e9f98c5b5cbb9f69097c'

* commit '57ed8debb9b9cc565cc6e9f98c5b5cbb9f69097c':
  wmv2: Propagate the wmv2 idct permutation type to the dsputils context
  rtp: Make sure priv_data is set before reading it

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomatroskadec: export codec bits_per_coded_sample
Paul B Mahol [Thu, 24 Jan 2013 12:13:46 +0000 (12:13 +0000)]
matroskadec: export codec bits_per_coded_sample

Fixes -codec copy with TTA from matroska to matroska.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agomatroskaenc: fix -codec copy with TTA
Paul B Mahol [Thu, 24 Jan 2013 11:58:51 +0000 (11:58 +0000)]
matroskaenc: fix -codec copy with TTA

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agomatroskaenc: support TTA muxing
Paul B Mahol [Thu, 24 Jan 2013 11:50:41 +0000 (11:50 +0000)]
matroskaenc: support TTA muxing

TTA in matroska does not store any private data.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agodoc/eval: fix/review the section about SI prefixes and usage
Stefano Sabatini [Wed, 23 Jan 2013 11:06:41 +0000 (12:06 +0100)]
doc/eval: fix/review the section about SI prefixes and usage

In particular, prefer "prefix" to "postfix" as in the tool manuals, and
specify powers of 2 and 10 explicitly.

This is based on the commit:
commit 2bf794b69820273e2284d69e9b9c98f5b7136add
Author: Marcus Stollsteimer <sto.mar@web.de>
Date:   Mon Nov 19 21:39:20 2012 +0100