ffmpeg.git
6 years agoproresenc_kostya: do not attempt to free random things
Michael Niedermayer [Mon, 6 Aug 2012 23:11:28 +0000 (01:11 +0200)]
proresenc_kostya: do not attempt to free random things

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: disable assert on current_picture_ptr being null.
Michael Niedermayer [Mon, 6 Aug 2012 22:18:59 +0000 (00:18 +0200)]
h264: disable assert on current_picture_ptr being null.

It is possible in various error pathes as well as gap handling
that this has already been allocated. Its not clear why that
would be a problem with the current code, thus disable the
assert to avoid common assert failure when asserts are enabled.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 6 Aug 2012 20:14:43 +0000 (22:14 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  nuv: K&R formatting cosmetics
  build: generalise rules and variable settings for av* programs
  nuv: check RTjpeg header for validity
  Revert "nuv: check per-frame header for validity."
  imc: remove unused field IMCContext.one_div_log2
  imc: fix size of a memset()
  imc: remove empty if() block
  fate: simplify variable setting filter.mak
  lavf: Declare an AVRational struct without a struct literal

Conflicts:
Makefile
configure
libavcodec/nuv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavidec: parse INFO tags at the end
Michael Niedermayer [Mon, 6 Aug 2012 19:07:23 +0000 (21:07 +0200)]
avidec: parse INFO tags at the end

Fixes Ticket1123

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomsrle: fix extradata palette handling
Michael Niedermayer [Mon, 6 Aug 2012 17:34:09 +0000 (19:34 +0200)]
msrle: fix extradata palette handling

Fixes Ticket1273

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agonuv: K&R formatting cosmetics
Diego Biurrun [Mon, 6 Aug 2012 13:49:51 +0000 (15:49 +0200)]
nuv: K&R formatting cosmetics

6 years agobuild: generalise rules and variable settings for av* programs
Mans Rullgard [Sat, 4 Aug 2012 18:04:08 +0000 (19:04 +0100)]
build: generalise rules and variable settings for av* programs

This simplifies adding extra flags for individual programs
and also allows more than one object file per program.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoffprobe: refactor frames decoding.
Nicolas George [Tue, 24 Jul 2012 13:13:02 +0000 (15:13 +0200)]
ffprobe: refactor frames decoding.

6 years agompegvideo: remove last_picture_ptr / h264 assert.
Michael Niedermayer [Mon, 6 Aug 2012 14:49:49 +0000 (16:49 +0200)]
mpegvideo: remove last_picture_ptr / h264 assert.

This assert is no longer true since h264 error concealment needs
last_picture_ptr to be set.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo.c: convert some asserts to av_assert
Michael Niedermayer [Mon, 6 Aug 2012 14:40:22 +0000 (16:40 +0200)]
mpegvideo.c: convert some asserts to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosvq1enc: set picture_structure correctly
Michael Niedermayer [Mon, 6 Aug 2012 14:28:13 +0000 (16:28 +0200)]
svq1enc: set picture_structure correctly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo_enc: switch some assert to av_assert
Michael Niedermayer [Mon, 6 Aug 2012 12:39:40 +0000 (14:39 +0200)]
mpegvideo_enc: switch some assert to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo_enc: remove assert that has become obsolete with the new API
Michael Niedermayer [Mon, 6 Aug 2012 08:26:04 +0000 (10:26 +0200)]
mpegvideo_enc: remove assert that has become obsolete with the new API

it now just checks uninitialized and unused data.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agonuv: check RTjpeg header for validity
Janne Grunau [Mon, 6 Aug 2012 11:59:04 +0000 (13:59 +0200)]
nuv: check RTjpeg header for validity

CC: libav-stable@libav.org
6 years agoRevert "nuv: check per-frame header for validity."
Janne Grunau [Mon, 6 Aug 2012 11:50:51 +0000 (13:50 +0200)]
Revert "nuv: check per-frame header for validity."

The check is bogus since the nuv frameheader is already skipped
and the (decompressed) RTjpeg header is checked.

This reverts commit f6afacdb3b708720c9fb85984b4f7fdbca2b2036.

CC: libav-stable@libav.org
6 years agoimc: remove unused field IMCContext.one_div_log2
Mans Rullgard [Sun, 5 Aug 2012 21:36:09 +0000 (22:36 +0100)]
imc: remove unused field IMCContext.one_div_log2

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoimc: fix size of a memset()
Mans Rullgard [Sun, 5 Aug 2012 21:32:20 +0000 (22:32 +0100)]
imc: fix size of a memset()

IMCContext was changed from an array to a pointer in 66b84e4,
but this memset() was not updated.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoimc: remove empty if() block
Mans Rullgard [Sun, 5 Aug 2012 17:32:03 +0000 (18:32 +0100)]
imc: remove empty if() block

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agofate: simplify variable setting filter.mak
Mans Rullgard [Sun, 5 Aug 2012 11:06:19 +0000 (12:06 +0100)]
fate: simplify variable setting filter.mak

This removes some needless indirection and duplication.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoudp: do not call pthread_{mutex,cond}_destroy when not initialized.
anonymous [Mon, 6 Aug 2012 07:56:50 +0000 (09:56 +0200)]
udp: do not call pthread_{mutex,cond}_destroy when not initialized.

This seems to cause a crash on Windows.

The author of that patch was a random guy on IRC who wants to stay anonymous.

6 years agoshorten: fix cmd type
Michael Niedermayer [Mon, 6 Aug 2012 07:24:34 +0000 (09:24 +0200)]
shorten: fix cmd type

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompc7: remove duplicated definitions
Paul B Mahol [Mon, 6 Aug 2012 01:33:37 +0000 (01:33 +0000)]
mpc7: remove duplicated definitions

They are available in mpc.h

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agompc8: fix pts
Michael Niedermayer [Mon, 6 Aug 2012 00:51:11 +0000 (02:51 +0200)]
mpc8: fix pts

Fixes Ticket1254

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomov: dont clip timestamps at 0
Michael Niedermayer [Sun, 5 Aug 2012 23:27:52 +0000 (01:27 +0200)]
mov: dont clip timestamps at 0

Fixes Ticket1251

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: make libtwolame check more robust
Paul B Mahol [Sun, 5 Aug 2012 23:33:36 +0000 (23:33 +0000)]
configure: make libtwolame check more robust

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agomovenv: fix remuxing of qdm2
Piotr Bandurski [Sun, 5 Aug 2012 22:37:28 +0000 (00:37 +0200)]
movenv: fix remuxing of qdm2

6 years agoaiffenc: fix remuxing of qdm2
Piotr Bandurski [Sun, 5 Aug 2012 22:08:53 +0000 (00:08 +0200)]
aiffenc: fix remuxing of qdm2

6 years agoReplace various inlined inverse AVRational with av_inv_q().
Clément Bœsch [Sun, 5 Aug 2012 21:25:27 +0000 (23:25 +0200)]
Replace various inlined inverse AVRational with av_inv_q().

6 years agolavfi/overlay: remove dead initialization.
Clément Bœsch [Sun, 5 Aug 2012 19:08:42 +0000 (21:08 +0200)]
lavfi/overlay: remove dead initialization.

6 years agomovenc: fix remuxing of svq3
Piotr Bandurski [Sun, 5 Aug 2012 21:58:10 +0000 (23:58 +0200)]
movenc: fix remuxing of svq3

6 years agolavf: Declare an AVRational struct without a struct literal
Martin Storsjö [Sun, 5 Aug 2012 19:55:21 +0000 (22:55 +0300)]
lavf: Declare an AVRational struct without a struct literal

At this place, the normal way of initializing a struct works
fine, there's no need for a struct literal.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 5 Aug 2012 20:17:02 +0000 (22:17 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: h264_idct: Rename x264_add8x4_idct_sse2 --> h264_add8x4_idct_sse2
  rational: add av_inv_q() returning the inverse of an AVRational
  dpx: Make start offset unsigned
  lavfi: properly signal out-of-memory error in ff_filter_samples
  cosmetics: Fix a few switched periods and linebreaks
  zerocodec: Fix memleak in decode_frame
  zerocodec: Cosmetics

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: h264_idct: Rename x264_add8x4_idct_sse2 --> h264_add8x4_idct_sse2
Diego Biurrun [Tue, 31 Jul 2012 22:17:43 +0000 (00:17 +0200)]
x86: h264_idct: Rename x264_add8x4_idct_sse2 --> h264_add8x4_idct_sse2

6 years agooggdec: Initialize stream index to -1 in ogg_packet.
Reimar Döffinger [Sun, 5 Aug 2012 07:45:04 +0000 (09:45 +0200)]
oggdec: Initialize stream index to -1 in ogg_packet.

The previous method of having to initialize it outside lead
to incorrect code: even if it was initialized, it usually was
only initialized once, thus a packet that could not be matched
to any stream would just be processed with the return values
from the previous call.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agooggdec: simplify start time calculation code.
Reimar Döffinger [Sun, 5 Aug 2012 07:41:20 +0000 (09:41 +0200)]
oggdec: simplify start time calculation code.

Also slightly more correct behaviour in case streams_left for
some reason is 0 from the start.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
6 years agolibtwolame MP2 encoding support
Paul B Mahol [Wed, 1 Aug 2012 14:33:34 +0000 (14:33 +0000)]
libtwolame MP2 encoding support

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agorational: add av_inv_q() returning the inverse of an AVRational
Mans Rullgard [Sun, 29 Jul 2012 13:58:53 +0000 (14:58 +0100)]
rational: add av_inv_q() returning the inverse of an AVRational

This allows simplifying a few expressions.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agodpx: Make start offset unsigned
Derek Buitenhuis [Sat, 4 Aug 2012 23:41:20 +0000 (19:41 -0400)]
dpx: Make start offset unsigned

Some corrupted files would end up with a negative offset,
and segfault.

Fixes bug #177.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agomatroskaenc: Implement support for ALAC
Moritz Bunkus [Sun, 5 Aug 2012 16:34:28 +0000 (18:34 +0200)]
matroskaenc: Implement support for ALAC

6 years agoass subtitles: Fix valgrind warnings.
Philip Langdale [Sun, 5 Aug 2012 15:57:20 +0000 (08:57 -0700)]
ass subtitles: Fix valgrind warnings.

We're now running some of this code through valgrind for the first
time, and a few warnings showed up stemming from two problems.

1) The ASS code assumes the subtitle header is null terminated, but
it wasn't, and passing the size down doesn't look like fun, so I
added a terminator

2) The code wasn't freeing all of its state.

Signed-off-by: Philip Langdale <philipl@overt.org>
6 years agomatroskadec: prevent potential integer overflow
Michael Niedermayer [Sun, 5 Aug 2012 15:04:59 +0000 (17:04 +0200)]
matroskadec: prevent potential integer overflow

Iam not sure this can happen, but its safer we check.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomatroskadec: Implement support for ALAC
Moritz Bunkus [Sun, 5 Aug 2012 14:25:48 +0000 (16:25 +0200)]
matroskadec: Implement support for ALAC

This patch implements support reading ALAC from Matroska files. The
only non-trivial thing about it is that only the ALAC magic cookie is
stored in Matroska's CodecPrivate element but not the "atom size",
"tag" and "tag version" fields that FFMPEG's ALAC decoder
expects. However, those are trivial to re-create.

Sample files are available:
http://www.bunkus.org/videotools/mkvtoolnix/samples/alac/alac-in-matroska.mka
and the CoreAudio file it was created from with today's mkvmerge:
http://www.bunkus.org/videotools/mkvtoolnix/samples/alac/alac-in-matroska-source.caf

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: add bitexact flag to fate-sub-movtextenc
Michael Niedermayer [Sun, 5 Aug 2012 15:58:08 +0000 (17:58 +0200)]
fate: add bitexact flag to fate-sub-movtextenc

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavcodec/options_table: mark flags as also for subtitles
Michael Niedermayer [Sun, 5 Aug 2012 15:55:26 +0000 (17:55 +0200)]
libavcodec/options_table: mark flags as also for subtitles

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/filters: fix typo in "@end table."
Stefano Sabatini [Sun, 5 Aug 2012 15:49:14 +0000 (17:49 +0200)]
doc/filters: fix typo in "@end table."

Remove erroneously added trailing dot.

6 years agomovenc: Fix unfreed memory found by valgrind.
Philip Langdale [Sun, 5 Aug 2012 15:26:49 +0000 (08:26 -0700)]
movenc: Fix unfreed memory found by valgrind.

Signed-off-by: Philip Langdale <philipl@overt.org>
6 years agodoc/filters: add mandelbrot source documentation
Stefano Sabatini [Sun, 5 Aug 2012 09:22:54 +0000 (11:22 +0200)]
doc/filters: add mandelbrot source documentation

Address trac ticket #1492.

6 years agolavf/img2dec: add start_number_range option
Stefano Sabatini [Sun, 5 Aug 2012 08:04:02 +0000 (10:04 +0200)]
lavf/img2dec: add start_number_range option

6 years agoexamples/muxing: drop duplicated code in add_video_stream()
Stefano Sabatini [Fri, 3 Aug 2012 15:56:14 +0000 (17:56 +0200)]
examples/muxing: drop duplicated code in add_video_stream()

6 years agolavfi: properly signal out-of-memory error in ff_filter_samples
Reinhard Tartler [Sat, 4 Aug 2012 13:24:15 +0000 (15:24 +0200)]
lavfi: properly signal out-of-memory error in ff_filter_samples

Found with a clang-scan report on http://fate.libav.org/csa/

6 years agoconfigure: fix lib.exe check
Hendrik Leppkes [Sun, 5 Aug 2012 08:23:50 +0000 (10:23 +0200)]
configure: fix lib.exe check

Running lib.exe without parameters will always result in an error,
and failing the check.
Using the -list paramter results in a success if lib.exe is present.

6 years agooggdec: check stream index before using it in ogg_get_length()
Michael Niedermayer [Sun, 5 Aug 2012 02:41:34 +0000 (04:41 +0200)]
oggdec: check stream index before using it in ogg_get_length()

Fixes crash based on a uninitialized array index read.
If the read does not crash then out of array writes based
on the same index might have been triggered afterwards.

Found-by: inferno@chromium.org
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/demuxers.texi: avoid comma splice in image2 documentation
Stefano Sabatini [Sat, 4 Aug 2012 16:25:34 +0000 (18:25 +0200)]
doc/demuxers.texi: avoid comma splice in image2 documentation

Add "and" proposition for connecting two sentences.

6 years agolavf/img2doc: document options
Stefano Sabatini [Sat, 4 Aug 2012 11:04:40 +0000 (13:04 +0200)]
lavf/img2doc: document options

6 years agolavf/img2dec: improve error logging in case of find_image_range() failure
Stefano Sabatini [Sat, 4 Aug 2012 15:34:53 +0000 (17:34 +0200)]
lavf/img2dec: improve error logging in case of find_image_range() failure

6 years agolavf/img2dec: sort options by name
Stefano Sabatini [Sat, 4 Aug 2012 10:45:09 +0000 (12:45 +0200)]
lavf/img2dec: sort options by name

6 years agolavf/img2dec: introduce and use FIRST_INDEX_SEARCH_RANGE macro in find_image_range
Stefano Sabatini [Sat, 4 Aug 2012 15:15:23 +0000 (17:15 +0200)]
lavf/img2dec: introduce and use FIRST_INDEX_SEARCH_RANGE macro in find_image_range

6 years agolavf/img2dec: fix out-of-range check in find_image_range()
Stefano Sabatini [Sat, 4 Aug 2012 15:07:26 +0000 (17:07 +0200)]
lavf/img2dec: fix out-of-range check in find_image_range()

Take the new parameter start_index into account.

6 years agolavf/img2dec: doxygen find_image_range() function
Stefano Sabatini [Sat, 4 Aug 2012 15:06:05 +0000 (17:06 +0200)]
lavf/img2dec: doxygen find_image_range() function

6 years agolavf/img2dec: rename find_image_range() "max_start" parameter to "start_index"
Stefano Sabatini [Sat, 4 Aug 2012 15:04:04 +0000 (17:04 +0200)]
lavf/img2dec: rename find_image_range() "max_start" parameter to "start_index"

The new name seems more consistent with the assumed logic.

"start_index" represents the minimum accepted value as first index, and
not the maximum value as implicitely assumed by the previous name.

6 years agolavf/img2dec: fix weird start_number count logic
Stefano Sabatini [Sat, 4 Aug 2012 14:54:18 +0000 (16:54 +0200)]
lavf/img2dec: fix weird start_number count logic

This seems consistent with the assumed meaning of the option.

6 years agoexamples/muxing: simplify alloc_picture()
Stefano Sabatini [Fri, 3 Aug 2012 15:51:00 +0000 (17:51 +0200)]
examples/muxing: simplify alloc_picture()

Use avpicture_alloc() high level function.

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 4 Aug 2012 20:39:25 +0000 (22:39 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavr: fix handling of custom mix matrices
  fate: force pix_fmt in lagarith-rgb32 test
  fate: add tests for lagarith lossless video codec.
  ARMv6: vp8: fix stack allocation with Apple's assembler
  ARM: vp56: allow inline asm to build with clang
  fft: 3dnow: fix register name typo in DECL_IMDCT macro
  x86: dct32: port to cpuflags
  x86: build: replace mmx2 by mmxext
  Revert "wmapro: prevent division by zero when sample rate is unspecified"
  wmapro: prevent division by zero when sample rate is unspecified
  lagarith: fix color plane inversion for YUY2 output.
  lagarith: pad RGB buffer by 1 byte.
  dsputil: make add_hfyu_left_prediction_sse4() support unaligned src.

Conflicts:
doc/APIchanges
libavcodec/lagarith.c
libavfilter/x86/gradfun.c
libavutil/cpu.h
libavutil/version.h
libswscale/utils.c
libswscale/version.h
libswscale/x86/yuv2rgb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocosmetics: Fix a few switched periods and linebreaks
Derek Buitenhuis [Sat, 4 Aug 2012 19:40:35 +0000 (15:40 -0400)]
cosmetics: Fix a few switched periods and linebreaks

Based on a patch by Piotr Bandurski.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoffmpeg: insert bitmap subtitles as video in filters.
Nicolas George [Thu, 26 Jul 2012 17:29:27 +0000 (19:29 +0200)]
ffmpeg: insert bitmap subtitles as video in filters.

With this feature, it becomes possible to perform commonly
requested tasks, such as hardcoding bitmap subtitles.

This will be reverted once libavfilter has proper support
for subtitles. All the changes have the string "sub2video"
in them, it makes it easy to spot the parts.

6 years agolavfi: document the constraints on incoming frames.
Nicolas George [Sun, 29 Jul 2012 16:58:42 +0000 (18:58 +0200)]
lavfi: document the constraints on incoming frames.

6 years agolavfi: use a new field for automatic buffer copy.
Nicolas George [Sun, 29 Jul 2012 16:43:45 +0000 (18:43 +0200)]
lavfi: use a new field for automatic buffer copy.

The code currently use cur_buf as the target of the copy,
but cur_buf can be cleared by the filter if it has given
the reference away or stored it elsewhere as soon as start_frame.

The code still relies on the fact that the reference is not
destroyed until end_frame. All filters currently follow that condition.
An av_assert1() is added to check it; it should at least cause
very visible errors in valgrind.

6 years agoMerge remote-tracking branch 'dwbuiten/master'
Michael Niedermayer [Sat, 4 Aug 2012 19:21:41 +0000 (21:21 +0200)]
Merge remote-tracking branch 'dwbuiten/master'

* dwbuiten/master:
  zerocodec: Fix memleak in decode_frame
  zerocodec: Cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomovtextenc: Remove dangling reference to movtext.h
Philip Langdale [Sat, 4 Aug 2012 19:19:46 +0000 (12:19 -0700)]
movtextenc: Remove dangling reference to movtext.h

This is a reference that leaked in from my future work to
support styling.

Signed-off-by: Philip Langdale <philipl@overt.org>
6 years agozerocodec: Fix memleak in decode_frame
Derek Buitenhuis [Sat, 4 Aug 2012 02:13:43 +0000 (22:13 -0400)]
zerocodec: Fix memleak in decode_frame

If there was a failure inflating, or reinitializing
the zstream, the current frame's buffer would be lost.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agozerocodec: Cosmetics
Derek Buitenhuis [Sat, 4 Aug 2012 01:41:24 +0000 (21:41 -0400)]
zerocodec: Cosmetics

Be consistent with error messages and code formatting.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agozerocodec: Fix memleak in decode_frame
Derek Buitenhuis [Sat, 4 Aug 2012 02:13:43 +0000 (22:13 -0400)]
zerocodec: Fix memleak in decode_frame

If there was a failure inflating, or reinitializing
the zstream, the current frame's buffer would be lost.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agozerocodec: Cosmetics
Derek Buitenhuis [Sat, 4 Aug 2012 01:41:24 +0000 (21:41 -0400)]
zerocodec: Cosmetics

Be consistent with error messages and code formatting.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoavformat/srtdec: Write duration into packet from srt demuxer.
Philip Langdale [Sat, 2 Jun 2012 23:15:38 +0000 (16:15 -0700)]
avformat/srtdec: Write duration into packet from srt demuxer.

The current demuxer does not bother to write packet durations,
which makes it impossible to remux into a new format.

Signed-off-by: Philip Langdale <philipl@overt.org>
6 years agomovenc: Handle need for extra packets to express subtitle duration.
Philip Langdale [Sun, 24 Jun 2012 22:05:33 +0000 (15:05 -0700)]
movenc: Handle need for extra packets to express subtitle duration.

As packet duration is not stored inherently in MPEG4 containers,
subtitles have their duration expressed by storing an additional
empty packet with a pts matching the desired end time of the real
subtitle. Additionally, it is generally expected that all streams
start at time = 0, so an empty packet needs to be inserted at the
beginning of the stream, before the first real subtitle.

Unfortunately, ffmpeg lacks a proper way to express that a subtitle
might map to multiple packets, so the muxer is the only place we
can handle this.

Signed-off-by: Philip Langdale <philipl@overt.org>
6 years agomovtextenc: 3GPP TS 26.245 Timed Text Encoder.
Philip Langdale [Wed, 6 Jun 2012 16:12:24 +0000 (09:12 -0700)]
movtextenc: 3GPP TS 26.245 Timed Text Encoder.

This change introduces a basic encoder for 3GPP Timed Text subtitles,
also known as TX3G, Quicktime subtitles, or "movtext" in the existing
code.

This initial change doesn't attempt to write styling information,
and just writes the plain text of the subtitles. I intend to add
support for styles eventually, but it's challenging due to a lack
of existing players that support them.

Note that an additional change is required to the mov/mp4 muxer to
write empty subtitle packets to indicate subtitle duration.

Signed-off-by: Philip Langdale <philipl@overt.org>
6 years agompegdemux: support MLP/AOB
Michael Niedermayer [Tue, 31 Jul 2012 18:54:33 +0000 (20:54 +0200)]
mpegdemux: support MLP/AOB

Fixes issue1731

Based-on-patch-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegdemux: move private stream 1 handling out of mpegps_read_pes_header
Michael Niedermayer [Tue, 31 Jul 2012 17:43:20 +0000 (19:43 +0200)]
mpegdemux: move private stream 1 handling out of mpegps_read_pes_header

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegdemux: remove redundant dvd audio code
Michael Niedermayer [Tue, 31 Jul 2012 17:20:00 +0000 (19:20 +0200)]
mpegdemux: remove redundant dvd audio code

This is almost a revert of: (the file from the report still works)

commit 80e58c6153249a40e47a20326b7626cbe0fcabd3
Author: Benoit Fouet <benoit.fouet@free.fr>
Date:   Wed Feb 11 11:09:36 2009 +0000

    Allow demuxing of audio substreams stored as 0x06 type.
    Fixes issue 725: MPEG2 PS with PCM audio.
    On behalf of Jai.

    Originally committed as revision 17150 to svn://svn.ffmpeg.org/ffmpeg/trunk

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavr: fix handling of custom mix matrices
Justin Ruggles [Sun, 29 Jul 2012 23:22:19 +0000 (19:22 -0400)]
lavr: fix handling of custom mix matrices

Adds some validation for changing parameters after setting the matrix and
fixes a bug in the conversion path setup.

6 years agocompute_pkt_fields: do not attempt to calculate dts when the delay hasnt been estimated.
Michael Niedermayer [Sat, 4 Aug 2012 13:39:22 +0000 (15:39 +0200)]
compute_pkt_fields: do not attempt to calculate dts when the delay hasnt been estimated.

Fixes ticket1242

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: move nb_decoded_frames out of info.
Michael Niedermayer [Sat, 4 Aug 2012 13:38:05 +0000 (15:38 +0200)]
lavf: move nb_decoded_frames out of info.

This way the variable is available outside find_stream_info

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agohas_decode_delay_been_guessed: adjust value for has_b_frames=0
Michael Niedermayer [Sat, 4 Aug 2012 13:36:51 +0000 (15:36 +0200)]
has_decode_delay_been_guessed: adjust value for has_b_frames=0

needed for a mkv file

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: move has_decode_delay_been_guessed() up to make it accessible to earlier functions
Michael Niedermayer [Sat, 4 Aug 2012 13:35:53 +0000 (15:35 +0200)]
lavf: move has_decode_delay_been_guessed() up to make it accessible to earlier functions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: print num_reorder_frames in debug output
Michael Niedermayer [Sat, 4 Aug 2012 13:34:27 +0000 (15:34 +0200)]
h264: print num_reorder_frames in debug output

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: force pix_fmt in lagarith-rgb32 test
Mans Rullgard [Sat, 4 Aug 2012 11:24:23 +0000 (12:24 +0100)]
fate: force pix_fmt in lagarith-rgb32 test

This makes big and little endian systems use the same output
format.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agofate: Rename FATE_SAMPLES make file variable to FATE_EXTERN
Alexander Strasser [Thu, 26 Jul 2012 22:41:36 +0000 (00:41 +0200)]
fate: Rename FATE_SAMPLES make file variable to FATE_EXTERN

  Restore functionality to set the samples directory via the
FATE_SAMPLES environment variable . This is broken since commit
63dcd16 was merged.

  Additionally the name FATE_EXTERN is more suited as the current
FATE_SAMPLES make file variable does not carry the name of the
FATE samples or the name of the directory they are stored in, but
does contain the names of the FATE targets that need external
samples. That is samples that are not in the repository and are
not generated on the fly.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
6 years agofate: add tests for lagarith lossless video codec.
Ronald S. Bultje [Fri, 3 Aug 2012 03:45:29 +0000 (20:45 -0700)]
fate: add tests for lagarith lossless video codec.

Based on patch by Oana Stratulat <oanaandreeastratulat@gmail.com>.

6 years agoLICENSE: Document all GPL files
Derek Buitenhuis [Sat, 4 Aug 2012 01:29:38 +0000 (21:29 -0400)]
LICENSE: Document all GPL files

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomatroskadec: check element size against stream limit in ebml_parse_elem()
Michael Niedermayer [Sat, 4 Aug 2012 00:27:51 +0000 (02:27 +0200)]
matroskadec: check element size against stream limit in ebml_parse_elem()

Fixes Ticket1195

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoARMv6: vp8: fix stack allocation with Apple's assembler
Mans Rullgard [Thu, 2 Aug 2012 22:18:08 +0000 (23:18 +0100)]
ARMv6: vp8: fix stack allocation with Apple's assembler

In the GNU assembler, a relational expression, bizarrely, has the
value -1 if true, whereas in Apple's it is +1.  This patch makes
sure the correct expression is used in both cases.

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agoARM: vp56: allow inline asm to build with clang
Mans Rullgard [Thu, 2 Aug 2012 21:53:47 +0000 (22:53 +0100)]
ARM: vp56: allow inline asm to build with clang

The clang integrated assembler does not support pre-UAL syntax,
while gcc requires pre-UAL syntax for ARM code.  A patch[1] for
clang to support the old syntax as well has been ignored since
January.

This patch chooses the syntax appropriate for each compiler,
allowing both to build the code.  Notably, this change allows
building for iphone with the latest Apple Xcode update.

[1] http://llvm.org/bugs/show_bug.cgi?id=11855

Signed-off-by: Mans Rullgard <mans@mansr.com>
6 years agofft: 3dnow: fix register name typo in DECL_IMDCT macro
Ronald S. Bultje [Fri, 3 Aug 2012 21:59:16 +0000 (14:59 -0700)]
fft: 3dnow: fix register name typo in DECL_IMDCT macro

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agomotion_est_template: switch to av_assert
Michael Niedermayer [Fri, 3 Aug 2012 22:06:20 +0000 (00:06 +0200)]
motion_est_template: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodvdec: switch to av_assert
Michael Niedermayer [Fri, 3 Aug 2012 22:05:56 +0000 (00:05 +0200)]
dvdec: switch to av_assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agog732_1: reduce difference to qatar
Michael Niedermayer [Fri, 3 Aug 2012 21:50:09 +0000 (23:50 +0200)]
g732_1: reduce difference to qatar

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 3 Aug 2012 20:43:44 +0000 (22:43 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  vc1dec: Remove separate scaling function for interlaced field MVs
  vc1dec: Invoke edge_emulation regardless of MV precision
  x86: Use consistent 3dnowext function and macro name suffixes
  g723_1: scale output as supposed for the case with postfilter disabled
  g723_1: increase excitation storage by 4
  g723_1: fix upper bound parameter from inverse maximum autocorrelation
  g723_1: make scale_vector() behave like the reference
  g723_1: fix off-by-one error in normalize_bits()
  g723_1: save/restore excitation with offset to store LPC history
  wmapro: prevent division by zero when sample rate is unspecified
  x86: proresdsp: improve SIGNEXTEND macro comments
  x86: h264dsp: K&R formatting cosmetics
  LICENSE: Document all GPL files

Conflicts:
libavcodec/g723_1.c
libavcodec/wmaprodec.c
libavcodec/x86/h264dsp_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: dct32: port to cpuflags
Diego Biurrun [Wed, 1 Aug 2012 17:28:08 +0000 (19:28 +0200)]
x86: dct32: port to cpuflags

6 years agox86: build: replace mmx2 by mmxext
Diego Biurrun [Sun, 8 Jul 2012 16:42:12 +0000 (18:42 +0200)]
x86: build: replace mmx2 by mmxext

Refactoring mmx2/mmxext YASM code with cpuflags will force renames.
So switching to a consistent naming scheme beforehand is sensible.
The name "mmxext" is more official and widespread and also the name
of the CPU flag, as reported e.g. by the Linux kernel.

6 years agolibopenjpegdec: increase max lowres from 5 to 31
Michael Bradshaw [Fri, 3 Aug 2012 14:07:48 +0000 (08:07 -0600)]
libopenjpegdec: increase max lowres from 5 to 31

OpenJPEG doesn't have a particular limit

Signed-off-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>