Michael Niedermayer
cde4741177
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>
2012-08-07 00:18:59 +02:00
Michael Niedermayer
7ae473e8a0
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>
2012-08-06 22:22:37 +02:00
Michael Niedermayer
a80ce390df
avidec: parse INFO tags at the end
...
Fixes Ticket1123
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-06 21:36:42 +02:00
Justin Ruggles
fdbeae4490
mpc8: add a flush function
...
Ensures that the next frame decoded after seeking will be decoded as a
keyframe.
2012-08-06 14:39:21 -04:00
Justin Ruggles
2fa57c9daf
mpc8: set packet duration and stream start time instead of tracking frames
...
Fixes mpc8 timestamps.
2012-08-06 14:39:21 -04:00
Michael Niedermayer
21eafa18e6
msrle: fix extradata palette handling
...
Fixes Ticket1273
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-06 19:39:11 +02:00
Diego Biurrun
cf22705e87
nuv: K&R formatting cosmetics
2012-08-06 19:03:33 +02:00
Mans Rullgard
baac24e680
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>
2012-08-06 17:43:29 +01:00
Nicolas George
d74ade7d5f
ffprobe: refactor frames decoding.
2012-08-06 17:37:59 +02:00
Michael Niedermayer
610c67df37
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>
2012-08-06 16:49:49 +02:00
Michael Niedermayer
e6690b6a56
mpegvideo.c: convert some asserts to av_assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-06 16:40:22 +02:00
Michael Niedermayer
3e0b4e32c9
svq1enc: set picture_structure correctly
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-06 16:28:13 +02:00
Michael Niedermayer
f8dbbe5464
mpegvideo_enc: switch some assert to av_assert
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-06 14:41:16 +02:00
Michael Niedermayer
f72e0d9a9f
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>
2012-08-06 14:41:16 +02:00
Janne Grunau
859a579e9b
nuv: check RTjpeg header for validity
...
CC: libav-stable@libav.org
2012-08-06 14:34:12 +02:00
Janne Grunau
110d015ad4
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 f6afacdb3b
.
CC: libav-stable@libav.org
2012-08-06 14:33:50 +02:00
Mans Rullgard
b40ea0f41d
imc: remove unused field IMCContext.one_div_log2
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-08-06 10:20:48 +01:00
Mans Rullgard
bc90230b98
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>
2012-08-06 10:20:42 +01:00
Mans Rullgard
2b6804328e
imc: remove empty if() block
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-08-06 10:20:11 +01:00
Mans Rullgard
add8f5eab7
fate: simplify variable setting filter.mak
...
This removes some needless indirection and duplication.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-08-06 10:19:27 +01:00
anonymous
388243bb27
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.
2012-08-06 10:06:26 +02:00
Michael Niedermayer
e6b9903d82
shorten: fix cmd type
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-06 09:24:59 +02:00
Paul B Mahol
9c1619b5fe
mpc7: remove duplicated definitions
...
They are available in mpc.h
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-08-06 01:33:37 +00:00
Michael Niedermayer
7bf16ec300
mpc8: fix pts
...
Fixes Ticket1254
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-06 02:51:11 +02:00
Michael Niedermayer
e4b53d995c
mov: dont clip timestamps at 0
...
Fixes Ticket1251
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-06 01:38:18 +02:00
Paul B Mahol
958df52ae0
configure: make libtwolame check more robust
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-08-05 23:33:36 +00:00
Piotr Bandurski
68f4156f44
movenv: fix remuxing of qdm2
2012-08-06 00:37:28 +02:00
Piotr Bandurski
1b72a7e8a9
aiffenc: fix remuxing of qdm2
2012-08-06 00:08:53 +02:00
Clément Bœsch
16dc5f2050
Replace various inlined inverse AVRational with av_inv_q().
2012-08-06 00:04:36 +02:00
Clément Bœsch
ad55244c96
lavfi/overlay: remove dead initialization.
2012-08-06 00:04:36 +02:00
Piotr Bandurski
5d2f89a23c
movenc: fix remuxing of svq3
2012-08-05 23:58:10 +02:00
Martin Storsjö
6c071a2b38
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>
2012-08-06 00:48:58 +03:00
Michael Niedermayer
b4780d03d0
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>
2012-08-05 22:17:02 +02:00
Diego Biurrun
2096857551
x86: h264_idct: Rename x264_add8x4_idct_sse2 --> h264_add8x4_idct_sse2
2012-08-05 21:40:49 +02:00
Reimar Döffinger
69aeba1396
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>
2012-08-05 19:47:52 +02:00
Reimar Döffinger
a4163b2d65
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>
2012-08-05 19:47:52 +02:00
Paul B Mahol
f5f98727b3
libtwolame MP2 encoding support
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-08-05 17:06:59 +00:00
Mans Rullgard
82494835c4
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>
2012-08-05 17:46:41 +01:00
Derek Buitenhuis
965efc1673
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>
2012-08-05 12:44:30 -04:00
Moritz Bunkus
fe40dc1cec
matroskaenc: Implement support for ALAC
2012-08-05 18:34:28 +02:00
Philip Langdale
50b4dbf65a
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>
2012-08-05 09:11:11 -07:00
Michael Niedermayer
c30f53e4d8
matroskadec: prevent potential integer overflow
...
Iam not sure this can happen, but its safer we check.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-05 17:59:12 +02:00
Moritz Bunkus
bc3b422029
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>
2012-08-05 17:59:12 +02:00
Michael Niedermayer
d106ffd942
fate: add bitexact flag to fate-sub-movtextenc
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-05 17:59:12 +02:00
Michael Niedermayer
b11b0e166e
libavcodec/options_table: mark flags as also for subtitles
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-05 17:59:12 +02:00
Stefano Sabatini
8331d56e0d
doc/filters: fix typo in "@end table."
...
Remove erroneously added trailing dot.
2012-08-05 17:50:59 +02:00
Philip Langdale
3eb56e8434
movenc: Fix unfreed memory found by valgrind.
...
Signed-off-by: Philip Langdale <philipl@overt.org>
2012-08-05 08:27:49 -07:00
Stefano Sabatini
8d6f46ab2c
doc/filters: add mandelbrot source documentation
...
Address trac ticket #1492 .
2012-08-05 15:45:55 +02:00
Stefano Sabatini
9bece76009
lavf/img2dec: add start_number_range option
2012-08-05 15:45:48 +02:00
Stefano Sabatini
b907655303
examples/muxing: drop duplicated code in add_video_stream()
2012-08-05 15:36:38 +02:00