ffmpeg.git
7 years agosws: Fix error diffusion flag
Michael Niedermayer [Sat, 19 Jan 2013 22:11:26 +0000 (23:11 +0100)]
sws: Fix error diffusion flag

The used flag was mistakenly overlapping with chroma drop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffmpeg: accept "chapters" as forced key frames.
Nicolas George [Wed, 2 Jan 2013 18:08:08 +0000 (19:08 +0100)]
ffmpeg: accept "chapters" as forced key frames.

Allow to force a key frame at the beginning of each chapter.

7 years agocmdline: fix -- to escape files starting with -
Michael Niedermayer [Thu, 17 Jan 2013 16:03:07 +0000 (17:03 +0100)]
cmdline: fix -- to escape files starting with -

Fixes Ticket2127

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavf/id3v2: cosmetics: reindent
Matthieu Bouron [Sat, 19 Jan 2013 12:38:26 +0000 (13:38 +0100)]
lavf/id3v2: cosmetics: reindent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoconfigure: Fix Barcelona and Bulldozer compiler options with suncc
James Almer [Sat, 19 Jan 2013 04:02:19 +0000 (01:02 -0300)]
configure: Fix Barcelona and Bulldozer compiler options with suncc

Barcelona/amdfam10 does not support SSE4 instructions.
Also, Bulldozer supports AVX instructions, so use them instead.

Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/Makefile: Fix make docclean
James Almer [Sat, 19 Jan 2013 03:48:59 +0000 (00:48 -0300)]
doc/Makefile: Fix make docclean

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 19 Jan 2013 12:18:10 +0000 (13:18 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: dsputil: Drop some unused macro definitions
  x86: Add a Yasm-based emms() replacement

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

* commit 'd633d12b2cc999cee3ac25bf9a810fe7ff03726d':
  x86inc: Add cvisible macro for C functions with public prefix

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b'
Michael Niedermayer [Sat, 19 Jan 2013 12:01:06 +0000 (13:01 +0100)]
Merge commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b'

* commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b':
  x86inc: Rename "program_name" to "private_prefix"
  configure: Run SHFLAGS through ldflags_filter()

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoAPIchanges: Add git version and fix version for avfilter_ref_get_channels().
Carl Eugen Hoyos [Sat, 19 Jan 2013 09:45:34 +0000 (10:45 +0100)]
APIchanges: Add git version and fix version for avfilter_ref_get_channels().

7 years agoAdd APIchanges entry for av_codec_get_tag2().
Carl Eugen Hoyos [Sat, 19 Jan 2013 09:42:27 +0000 (10:42 +0100)]
Add APIchanges entry for av_codec_get_tag2().

7 years agoh264: unmark frames at the end
Michael Niedermayer [Sat, 19 Jan 2013 05:18:24 +0000 (06:18 +0100)]
h264: unmark frames at the end

Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws: fix ED mono dither black level
Michael Niedermayer [Sat, 19 Jan 2013 03:21:44 +0000 (04:21 +0100)]
sws: fix ED mono dither black level

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'cus/stable'
Michael Niedermayer [Sat, 19 Jan 2013 02:56:00 +0000 (03:56 +0100)]
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: flush video filters on seek
  ffplay: use videoq.serial to detect obsolete frames

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi: EBU R.128 irregular time
sedacca@comcast.net [Fri, 18 Jan 2013 05:13:10 +0000 (05:13 +0000)]
lavfi: EBU R.128 irregular time

Correct the time interval between logged data rows to the expected
value of 100 milliseconds by naming a new loop counter variable
to be distinct from loop counters for inner loops that
inadvertently change the outer loop operation.

This suggested patch is 1 of 3 for Ticket #2144 "libavfilter ebur128
loudness inaccuracy, irregular time interval, LFE interference".
This suggested patch supersedes the contribution of January 15, 2013
in the thread “[PATCH] lavfi: EBU R.128 irreg time, ch weights, skip
LFE” which combined multiple fixes in one patch.

Reviewed-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws: Enable full chroma resolution when needed for ED dither
Michael Niedermayer [Sat, 19 Jan 2013 00:48:47 +0000 (01:48 +0100)]
sws: Enable full chroma resolution when needed for ED dither

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws: Only reset dither state for bitexact mode
Michael Niedermayer [Sat, 19 Jan 2013 00:40:10 +0000 (01:40 +0100)]
sws: Only reset dither state for bitexact mode

the output looks better with a random initial state than
all 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws: rgb/bgr 4/8 error diffusion dither
Michael Niedermayer [Sat, 19 Jan 2013 00:39:42 +0000 (01:39 +0100)]
sws: rgb/bgr 4/8 error diffusion dither

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosws: add AVOption flag for error diffusion dither
Michael Niedermayer [Sat, 19 Jan 2013 00:38:54 +0000 (01:38 +0100)]
sws: add AVOption flag for error diffusion dither

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/muxers: apply minor cosmetics to segment option descriptions
Stefano Sabatini [Fri, 18 Jan 2013 23:44:31 +0000 (00:44 +0100)]
doc/muxers: apply minor cosmetics to segment option descriptions

7 years agoffplay: flush video filters on seek
Marton Balint [Thu, 27 Dec 2012 00:59:12 +0000 (01:59 +0100)]
ffplay: flush video filters on seek

Actually we just re-create the filters, since there is no way to flush them.
Fixes hangup with yadif filter on seeking forward caused by a filtered frame
with a pts before the seek.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agoffplay: use videoq.serial to detect obsolete frames
Marton Balint [Wed, 2 Jan 2013 00:00:12 +0000 (01:00 +0100)]
ffplay: use videoq.serial to detect obsolete frames

Previously VideoPicture->skip was used for that, using videoq.serial enables us
to detect obsolete frames right after pushing flush_pkt to the packet queue, so
we don't have to wait for the decoder thread to pop the flush packet anymore.

This is good because until now a full video picture queue may have blocked the
decoder thread.

Signed-off-by: Marton Balint <cus@passwd.hu>
7 years agolavf/segment: do not auto-select a video stream with attached_pic disposition
Stefano Sabatini [Wed, 16 Jan 2013 19:10:12 +0000 (20:10 +0100)]
lavf/segment: do not auto-select a video stream with attached_pic disposition

In particular, fix trac ticket #2138.

7 years agolavf/segment: move reference stream selection code to a dedicated function
Stefano Sabatini [Wed, 16 Jan 2013 18:52:58 +0000 (19:52 +0100)]
lavf/segment: move reference stream selection code to a dedicated function

7 years agolavf/segment: remove now unused field list_max_segment_time
Stefano Sabatini [Fri, 21 Dec 2012 01:39:53 +0000 (02:39 +0100)]
lavf/segment: remove now unused field list_max_segment_time

7 years agolavf/segment: add support to segment list file entries sliding window listing
Stefano Sabatini [Thu, 20 Dec 2012 13:20:19 +0000 (14:20 +0100)]
lavf/segment: add support to segment list file entries sliding window listing

In particular, should fix trac ticket #1842.

7 years agolavf/segment: add SegmentListEntry and use it
Stefano Sabatini [Mon, 10 Dec 2012 23:14:22 +0000 (00:14 +0100)]
lavf/segment: add SegmentListEntry and use it

This patch is propedeutic to the incoming patch which adds
support to sliding window segment listing.

7 years agolavf/utils: provide feedback in case of invalid probe size
Stefano Sabatini [Wed, 16 Jan 2013 11:53:01 +0000 (12:53 +0100)]
lavf/utils: provide feedback in case of invalid probe size

Log message in case the max_probe_size value in av_probe_input_buffer()
is smaller than the minimum accepted value.

7 years agovf_fade: use AVPixFmtDescriptor to find out if pixel format have alpha
Paul B Mahol [Fri, 18 Jan 2013 15:08:50 +0000 (15:08 +0000)]
vf_fade: use AVPixFmtDescriptor to find out if pixel format have alpha

Remove alpha_pix_fmts[].

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agosws: Support error diffusion dither for mono output
Michael Niedermayer [Fri, 18 Jan 2013 22:01:08 +0000 (23:01 +0100)]
sws: Support error diffusion dither for mono output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/filters: create a dedicated "Examples" subsection for fade, and use @itemize
Stefano Sabatini [Fri, 18 Jan 2013 18:00:35 +0000 (19:00 +0100)]
doc/filters: create a dedicated "Examples" subsection for fade, and use @itemize

7 years agolavfi/fade: accept shorthand syntax
Stefano Sabatini [Fri, 18 Jan 2013 17:56:29 +0000 (18:56 +0100)]
lavfi/fade: accept shorthand syntax

7 years agox86: dsputil: Drop some unused macro definitions
Diego Biurrun [Wed, 16 Jan 2013 22:50:57 +0000 (23:50 +0100)]
x86: dsputil: Drop some unused macro definitions

7 years agox86: Add a Yasm-based emms() replacement
Martin Storsjö [Wed, 9 Jan 2013 20:57:41 +0000 (22:57 +0200)]
x86: Add a Yasm-based emms() replacement

This provides a fallback when building with Yasm enabled, but neither
inline assembly, nor the _mm_empty intrinsic are available or enabled.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agox86inc: Add cvisible macro for C functions with public prefix
Diego Biurrun [Wed, 9 Jan 2013 22:17:08 +0000 (23:17 +0100)]
x86inc: Add cvisible macro for C functions with public prefix

This allows defining externally visible library symbols.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agox86inc: Rename "program_name" to "private_prefix"
Diego Biurrun [Wed, 9 Jan 2013 22:15:14 +0000 (23:15 +0100)]
x86inc: Rename "program_name" to "private_prefix"

The new name is more descriptive and will allow defining a separate
public prefix for externally visible library symbols.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agoconfigure: Run SHFLAGS through ldflags_filter()
Sean McGovern [Mon, 14 Jan 2013 17:52:00 +0000 (12:52 -0500)]
configure: Run SHFLAGS through ldflags_filter()

These flags are as linker-specific as other LDFLAGS and thus
need to be translated to the correct linker syntax.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
7 years agodoc/filters: avoid @example for showing the drawbox shorthand syntax
Stefano Sabatini [Fri, 18 Jan 2013 17:36:35 +0000 (18:36 +0100)]
doc/filters: avoid @example for showing the drawbox shorthand syntax

Improve overall consistency.

7 years agogolomb: check log validity before shifting
Michael Niedermayer [Sat, 12 Jan 2013 21:14:25 +0000 (22:14 +0100)]
golomb: check log validity before shifting

Fixes invalid right shift in fate-cavs

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_fade: support YUVA422P & YUVA444P
Paul B Mahol [Fri, 18 Jan 2013 10:41:09 +0000 (10:41 +0000)]
vf_fade: support YUVA422P & YUVA444P

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoh264/get_lowest_part_list_y: remove unneeded operations
Michael Niedermayer [Wed, 16 Jan 2013 00:26:44 +0000 (01:26 +0100)]
h264/get_lowest_part_list_y: remove unneeded operations

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 18 Jan 2013 12:54:38 +0000 (13:54 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: avoid pointless copying of ref lists
  lavr: always reset mix function names and pointers in mix_function_init()
  lavr: call mix_function_init() in ff_audio_mix_set_matrix()
  fate: update ref after rv30_loop_filter fix
  rv30: fix masking in rv30_loop_filter()

Conflicts:
tests/ref/fate/filter-delogo
tests/ref/fate/rv30

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '80ac87c13dc8c6c063e26a464c5c542357c0583f'
Michael Niedermayer [Fri, 18 Jan 2013 12:36:39 +0000 (13:36 +0100)]
Merge commit '80ac87c13dc8c6c063e26a464c5c542357c0583f'

* commit '80ac87c13dc8c6c063e26a464c5c542357c0583f':
  lavc: support ZenoXVID custom tag
  libcdio: support recent cdio-paranoia
  float_dsp: Add #ifdef HAVE_INLINE_ASM around vector_fmul_window
  theora: Skip zero-sized headers

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix opencv detection.
Jonas Bechtel [Sun, 13 Jan 2013 20:45:15 +0000 (21:45 +0100)]
Fix opencv detection.

This commit changes the ".so" argument placement in check_ld sub-program.

7 years agoh264: avoid pointless copying of ref lists
Anton Khirnov [Thu, 17 Jan 2013 11:25:31 +0000 (12:25 +0100)]
h264: avoid pointless copying of ref lists

ref_list is constructed from other fields per slice when needed, so do
not copy it for both frame and slice threading.
default_ref_list is constructed per frame and still needs to be copied
to per-slice contexts for slice threading, but a copy is not needed for
frame threading.

7 years agoavcodec_decode_audio: do not trust the channel layout, use the channel count.
Michael Niedermayer [Fri, 18 Jan 2013 00:28:44 +0000 (01:28 +0100)]
avcodec_decode_audio: do not trust the channel layout, use the channel count.

Fixes memory corruption

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavr: always reset mix function names and pointers in mix_function_init()
Justin Ruggles [Wed, 16 Jan 2013 19:18:38 +0000 (14:18 -0500)]
lavr: always reset mix function names and pointers in mix_function_init()

CC: libav-stable@libav.org
7 years agolavr: call mix_function_init() in ff_audio_mix_set_matrix()
Justin Ruggles [Wed, 16 Jan 2013 19:15:57 +0000 (14:15 -0500)]
lavr: call mix_function_init() in ff_audio_mix_set_matrix()

This is needed if a custom matrix is set by the user after opening the
AVAudioResampleContext because the matrix channel count can change if
different mixing coefficients are used.

CC:libav-stable@libav.org

7 years agomlpdec: dont leave a invalid huff_lsb in the context.
Michael Niedermayer [Thu, 17 Jan 2013 23:22:39 +0000 (00:22 +0100)]
mlpdec: dont leave a invalid huff_lsb in the context.

Fix assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegvideo: reset context state on failed thread update.
Michael Niedermayer [Thu, 17 Jan 2013 21:45:12 +0000 (22:45 +0100)]
mpegvideo: reset context state on failed thread update.

Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: update ref after rv30_loop_filter fix
Luca Barbato [Thu, 17 Jan 2013 22:06:46 +0000 (23:06 +0100)]
fate: update ref after rv30_loop_filter fix

7 years agorv30: fix masking in rv30_loop_filter()
Xi Wang [Thu, 17 Jan 2013 06:24:15 +0000 (01:24 -0500)]
rv30: fix masking in rv30_loop_filter()

The mask `x && (1 << y)' is incorrect and always yields true.

The correct form should be `x & (1 << y)'.

CC: libav-stable@libav.org
Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agolavc: support ZenoXVID custom tag
Luca Barbato [Thu, 17 Jan 2013 13:12:44 +0000 (14:12 +0100)]
lavc: support ZenoXVID custom tag

Looks like this kind of samples are produced by certain Russian
equipment.

7 years agolibcdio: support recent cdio-paranoia
Luca Barbato [Thu, 17 Jan 2013 10:24:01 +0000 (11:24 +0100)]
libcdio: support recent cdio-paranoia

Upstream decided to split the paranoia interface and move the headers
accordingly.

7 years agoUse new function av_codec_get_tag2() in ffmpeg.c.
Carl Eugen Hoyos [Thu, 17 Jan 2013 19:46:21 +0000 (20:46 +0100)]
Use new function av_codec_get_tag2() in ffmpeg.c.

Fixes ticket #1953.

7 years agoAdd a new function av_codec_get_tag2().
Carl Eugen Hoyos [Thu, 17 Jan 2013 19:44:33 +0000 (20:44 +0100)]
Add a new function av_codec_get_tag2().

av_codec_get_tag() may return 0 both in case a codec_tag was
found and if no codec_tag was found.
The new function does not have this ambiguity.

7 years ago.gitignore: add /doc/examples/pc-uninstalled
Paul B Mahol [Wed, 16 Jan 2013 20:08:20 +0000 (20:08 +0000)]
.gitignore: add /doc/examples/pc-uninstalled

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agofloat_dsp: Add #ifdef HAVE_INLINE_ASM around vector_fmul_window
Martin Storsjö [Thu, 17 Jan 2013 16:58:25 +0000 (18:58 +0200)]
float_dsp: Add #ifdef HAVE_INLINE_ASM around vector_fmul_window

This fixes builds on 64bit MSVC.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agotheora: Skip zero-sized headers
Martin Storsjö [Thu, 17 Jan 2013 14:03:36 +0000 (16:03 +0200)]
theora: Skip zero-sized headers

This fixes a regression since d9cf5f51 with theora over RTP
(possibly with other variants of theora as well).

In theora over RTP, the second of the 3 headers turns out to be
0 bytes long, which prior to d9cf5f51 worked just fine. After
d9cf5f51, reading from the bitstream reader fails (since the reader
wasn't initialized but returned an error if initialized with 0 bits).

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoOnly skip MLP header in mpeg files if the codec actually is MLP.
Carl Eugen Hoyos [Thu, 17 Jan 2013 16:19:08 +0000 (17:19 +0100)]
Only skip MLP header in mpeg files if the codec actually is MLP.

Fixes PCM audio in Kansas Pheasant Hunt 2000 mpg file.
Reported-by: Mashiat Sarker Shakkhar
7 years agoMake the latm decoder less verbose on initialisation.
Carl Eugen Hoyos [Thu, 17 Jan 2013 15:12:59 +0000 (16:12 +0100)]
Make the latm decoder less verbose on initialisation.

Reviewed-by: Paul B Mahol
7 years agomux/chunked interleaver: better align duration chunks.
Michael Niedermayer [Tue, 15 Jan 2013 23:03:36 +0000 (00:03 +0100)]
mux/chunked interleaver: better align duration chunks.

This code causes the chunking to tend toward more optimal
alignment between streams.
The first chunks can still be less optimal aligned

7 years agomux: de-obfuscate chunked interleaver checks
Michael Niedermayer [Thu, 17 Jan 2013 14:08:50 +0000 (15:08 +0100)]
mux: de-obfuscate chunked interleaver checks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomux: simplify chunking interleaver code
Michael Niedermayer [Tue, 15 Jan 2013 22:56:37 +0000 (23:56 +0100)]
mux: simplify chunking interleaver code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 17 Jan 2013 12:44:37 +0000 (13:44 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  idcin: fix memleaks in idcin_read_packet()

Conflicts:
libavformat/idcin.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolatmenc: Check for LOAS sync word
James Almer [Wed, 16 Jan 2013 21:27:14 +0000 (18:27 -0300)]
latmenc: Check for LOAS sync word

Write the packet unaltered if found.

Fixes ticket #1917

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoFix detection of struct v4l2_frmsize_discrete.
Carl Eugen Hoyos [Thu, 17 Jan 2013 01:11:12 +0000 (02:11 +0100)]
Fix detection of struct v4l2_frmsize_discrete.

It was always detected successfully.

7 years agoh264: add assert to check that block_offset is consistent.
Michael Niedermayer [Wed, 16 Jan 2013 23:15:33 +0000 (00:15 +0100)]
h264: add assert to check that block_offset is consistent.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: always copy linesizes in thread update
Michael Niedermayer [Wed, 16 Jan 2013 23:00:34 +0000 (00:00 +0100)]
h264: always copy linesizes in thread update

Fixes inconsistencies in context

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: always copy block_offset in thread update
Michael Niedermayer [Wed, 16 Jan 2013 23:00:34 +0000 (00:00 +0100)]
h264: always copy block_offset in thread update

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovima: switch to init_get_bits8()
Paul B Mahol [Wed, 16 Jan 2013 19:51:39 +0000 (19:51 +0000)]
vima: switch to init_get_bits8()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agomux: fix chunked interleaver
Michael Niedermayer [Tue, 15 Jan 2013 18:58:23 +0000 (19:58 +0100)]
mux: fix chunked interleaver

The code did not account properly for packets that where added to
the end of the packet list. Also flags for such packets where not
set correctly leading to incorrect chunked interleaving.

Reported-by: bcoudurier
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomips: move vector_fmul_window_mips to libavutil
Michael Niedermayer [Wed, 16 Jan 2013 12:22:48 +0000 (13:22 +0100)]
mips: move vector_fmul_window_mips to libavutil

Reviewed-by: "Babic, Nedeljko" <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoidcin: fix memleaks in idcin_read_packet()
Justin Ruggles [Tue, 15 Jan 2013 21:20:57 +0000 (16:20 -0500)]
idcin: fix memleaks in idcin_read_packet()

Fixes fate-id-cin-video failures when running FATE with valgrind.

7 years agolafv/matroska: add A_OPUS/EXPERIMENTAL codec name.
Nicolas George [Sun, 13 Jan 2013 20:34:03 +0000 (21:34 +0100)]
lafv/matroska: add A_OPUS/EXPERIMENTAL codec name.

The exact packing of Opus inside Matroska is not finalized.
Use A_OPUS/EXPERIMENTAL as codec name, like mkvtoolnix.
The A_OPUS name stays to let ffmpeg open files it has produced
until now, but newly produced file use the EXPERIMENTAL version.
Once the spec is stabilized it will be possible to consider
options to ensure compatibility with these files.

7 years agoconfigure: suppress "enumerated type mixed with another type" for icc
Michael Niedermayer [Thu, 3 Jan 2013 14:57:42 +0000 (15:57 +0100)]
configure: suppress "enumerated type mixed with another type" for icc

icc should not complain when 2 enum values are combined (for example when
used as flags)
Adding casts to suppress these would not help code quality

Reviewed-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomux: fix chunked_duration rounding anomaly
Michael Niedermayer [Tue, 15 Jan 2013 19:04:52 +0000 (20:04 +0100)]
mux: fix chunked_duration rounding anomaly

a small value was rounded to 0 and then treated special as if
chunked_duration was 0. This led to a inconsistency that further led
to wrong interleaving

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 16 Jan 2013 11:38:41 +0000 (12:38 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavc: Move vector_fmul_window to AVFloatDSPContext
  rtpdec_mpeg4: Check the remaining amount of data before reading

Conflicts:
libavcodec/dsputil.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavd/v4l2: init return value.
Nicolas George [Wed, 16 Jan 2013 11:00:06 +0000 (12:00 +0100)]
lavd/v4l2: init return value.

Fix a warning and random failures.

7 years agoMerge commit '977d4a3b8a2dbc2fb5e747c7072485016c9cdfaa'
Michael Niedermayer [Wed, 16 Jan 2013 11:13:10 +0000 (12:13 +0100)]
Merge commit '977d4a3b8a2dbc2fb5e747c7072485016c9cdfaa'

* commit '977d4a3b8a2dbc2fb5e747c7072485016c9cdfaa':
  rtpdec_mpeg4: Check the return value from malloc
  srtp: Mark a few variables as uninitialized

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '0eecafc948b74c247ebbc59f18f508db5d590d0b'
Michael Niedermayer [Wed, 16 Jan 2013 11:07:04 +0000 (12:07 +0100)]
Merge commit '0eecafc948b74c247ebbc59f18f508db5d590d0b'

* commit '0eecafc948b74c247ebbc59f18f508db5d590d0b':
  configure: Make the new srtp protocol depend on the rtp protocol
  lavf: Add a fate test for the SRTP functions
  lavu: Add a fate test for the HMAC API

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'fb845ffdd335a1efd6dfd43e8adeb530397b348e'
Michael Niedermayer [Wed, 16 Jan 2013 11:01:21 +0000 (12:01 +0100)]
Merge commit 'fb845ffdd335a1efd6dfd43e8adeb530397b348e'

* commit 'fb845ffdd335a1efd6dfd43e8adeb530397b348e':
  h264: add 3 pixels below for subpixel filter wait position
  dvdsubdec: Support palette in mkv

Conflicts:
libavcodec/dvdsubdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit 'dae1d507af94261bafd3b11549884e5d1eca590e'
Michael Niedermayer [Wed, 16 Jan 2013 10:44:23 +0000 (11:44 +0100)]
Merge commit 'dae1d507af94261bafd3b11549884e5d1eca590e'

* commit 'dae1d507af94261bafd3b11549884e5d1eca590e':
  x86: Add PAVGB macro to abstract pavgb/pavgusb instruction via cpuflags
  vf_fps: add final flushed frames to the dropped frame count
  rv34_parser: Adjust #if for disabling individual parsers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavd/v4l2: update broken link to v4l2 video capture example
Stephan Hilb [Wed, 16 Jan 2013 10:27:20 +0000 (11:27 +0100)]
lavd/v4l2: update broken link to v4l2 video capture example

Reviewed-by: Stefano Sabatini
7 years agolavd/v4l2: improve debug message
Stephan Hilb [Wed, 16 Jan 2013 10:26:38 +0000 (11:26 +0100)]
lavd/v4l2: improve debug message

Reviewed-by: Stefano Sabatini
7 years agolavc: Move vector_fmul_window to AVFloatDSPContext
Justin Ruggles [Mon, 7 Jan 2013 04:47:30 +0000 (23:47 -0500)]
lavc: Move vector_fmul_window to AVFloatDSPContext

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
7 years agortpdec_mpeg4: Check the remaining amount of data before reading
Martin Storsjö [Tue, 15 Jan 2013 13:35:18 +0000 (15:35 +0200)]
rtpdec_mpeg4: Check the remaining amount of data before reading

This fixes possible buffer overreads.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agomotion_est: Limit motion vector search range to MAX_MV
Michael Niedermayer [Wed, 16 Jan 2013 04:54:19 +0000 (05:54 +0100)]
motion_est: Limit motion vector search range to MAX_MV

Fixes out of array reads with videos exceeding MAX_MV

Found-by: Thierry Foucu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agompegvideo: Increase MAX_MV for HD video
Michael Niedermayer [Wed, 16 Jan 2013 04:51:04 +0000 (05:51 +0100)]
mpegvideo: Increase MAX_MV for HD video

Fixes out of array reads

Found-by: Thierry Foucu
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: document h264_set_parameter_from_sps() re-calling behavior
Michael Niedermayer [Wed, 16 Jan 2013 04:22:30 +0000 (05:22 +0100)]
h264: document h264_set_parameter_from_sps() re-calling behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: do not mess up cur_chroma_format_idc during thread update
Michael Niedermayer [Wed, 16 Jan 2013 03:46:20 +0000 (04:46 +0100)]
h264: do not mess up cur_chroma_format_idc during thread update

Fixes out of array reads
Regression probably since allowing pixel format changes or a related commit

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoh264: add 3 pixels below for subpixel filter wait position.
Ronald S. Bultje [Tue, 15 Jan 2013 16:38:54 +0000 (08:38 -0800)]
h264: add 3 pixels below for subpixel filter wait position.

If the motion vector is at a subpixel position, we need 3 pixels below
the motion vector's wholepel position available, not 2, since the MC
filter is a sixtap filter for the hpel position, and then a bilin filter
for the qpel position.

This patch fixes highly irreproducible (0.1%) fate failures in frame 2
and 4 of h264-conformance-cama2_vtc_b (e.g. first P-frame, first field,
last line of MB x=40,y=2 and second field and last lines of MBs x=39-40,
y=3). These used pre-loopfilter instead of post-loopfilter data because
the await_progress() waited for one line too little in that field, and
the motion vector of these particular MBs happened to align exactly to a
position where that demonstrates the bug.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoexamples/demuxing: free AVPacket after usage
Angelo Haller [Tue, 15 Jan 2013 22:37:08 +0000 (23:37 +0100)]
examples/demuxing: free AVPacket after usage

Fix leak.

7 years agotools: add plotframes script
Stefano Sabatini [Tue, 8 Jan 2013 22:27:37 +0000 (23:27 +0100)]
tools: add plotframes script

The script is ported from ffprobe/SourceForge and updated to the current
ffprobe version.

7 years agodoc/protocols: document HTTP protocol cookie support
Micah Galizia [Mon, 14 Jan 2013 02:33:20 +0000 (21:33 -0500)]
doc/protocols: document HTTP protocol cookie support

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agolavf/http: add HTTP protocol cookie support
Micah Galizia [Mon, 14 Jan 2013 02:32:57 +0000 (21:32 -0500)]
lavf/http: add HTTP protocol cookie support

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
7 years agortpdec_mpeg4: Check the return value from malloc
Martin Storsjö [Tue, 15 Jan 2013 13:27:30 +0000 (15:27 +0200)]
rtpdec_mpeg4: Check the return value from malloc

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agoconfigure: Make the new srtp protocol depend on the rtp protocol
Martin Storsjö [Tue, 15 Jan 2013 12:21:48 +0000 (14:21 +0200)]
configure: Make the new srtp protocol depend on the rtp protocol

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agosrtp: Mark a few variables as uninitialized
Martin Storsjö [Tue, 15 Jan 2013 13:19:55 +0000 (15:19 +0200)]
srtp: Mark a few variables as uninitialized

This squelches false positive warnings (with gcc) about them being
used uninitalized.

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agolavf: Add a fate test for the SRTP functions
Martin Storsjö [Tue, 15 Jan 2013 13:07:44 +0000 (15:07 +0200)]
lavf: Add a fate test for the SRTP functions

Signed-off-by: Martin Storsjö <martin@martin.st>