Stefano Sabatini
3a06ea8436
lavf/img2dec: add and document pattern_type option
...
Allow to override the default 'glob_sequence' value, which is deprecated
in favor of the new 'glob' and 'sequence' options.
The new pattern types should be easier on the user since they are more
predictable than 'glob_sequence', and do not require awkward escaping.
2012-08-08 23:43:36 +02:00
Clément Bœsch
cb5bb521aa
lavf/movenc: use two explicit bytes instead of a short.
...
This also avoids a pointless cast.
Idea-by: Reimar Döffinger
2012-08-08 23:13:52 +02:00
Michael Niedermayer
b615dbb319
lavf: block special characters in dump metadata
...
This is limited to the chars that arent filtered by av_log() already
we might filter more aggressively if theres some case where this becomes
needed.
Fixes Ticket1181
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-08 21:13:15 +02:00
Michael Niedermayer
ee475e272e
matroskadec: fix lace vs block duration.
...
Fixes Ticket1270
Thanks-to: Moritz Bunkus
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-08 17:54:49 +02:00
Clément Bœsch
aca0f78114
lavf/movenc: add frame rate heuristic for timecode frame rate.
...
Fixes ticket 1576.
2012-08-08 09:11:26 +02:00
Clément Bœsch
6b3484dcbc
lavf/mxfenc: better error handling with invalid frame rate.
2012-08-08 09:11:25 +02:00
Clément Bœsch
aad737c669
lavf/mxfenc: simplify frame rate checks.
2012-08-08 09:11:25 +02:00
Michael Niedermayer
bb2f13c19f
rename missed CodecID to AVCodecID
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-07 23:57:21 +02:00
Michael Niedermayer
7a72695c05
Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'
...
* commit '36ef5369ee9b336febc2c270f8718cec4476cb85':
Replace all CODEC_ID_* with AV_CODEC_ID_*
lavc: add AV prefix to codec ids.
Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
doc/examples/muxing.c
ffmpeg.c
ffprobe.c
ffserver.c
libavcodec/8svx.c
libavcodec/avcodec.h
libavcodec/dnxhd_parser.c
libavcodec/dvdsubdec.c
libavcodec/error_resilience.c
libavcodec/h263dec.c
libavcodec/libvorbisenc.c
libavcodec/mjpeg_parser.c
libavcodec/mjpegenc.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/pcm.c
libavcodec/r210dec.c
libavcodec/utils.c
libavcodec/v210dec.c
libavcodec/version.h
libavdevice/alsa-audio-dec.c
libavdevice/bktr.c
libavdevice/v4l2.c
libavformat/asfdec.c
libavformat/asfenc.c
libavformat/avformat.h
libavformat/avidec.c
libavformat/caf.c
libavformat/electronicarts.c
libavformat/flacdec.c
libavformat/flvdec.c
libavformat/flvenc.c
libavformat/framecrcenc.c
libavformat/img2.c
libavformat/img2dec.c
libavformat/img2enc.c
libavformat/ipmovie.c
libavformat/isom.c
libavformat/matroska.c
libavformat/matroskadec.c
libavformat/matroskaenc.c
libavformat/mov.c
libavformat/movenc.c
libavformat/mp3dec.c
libavformat/mpeg.c
libavformat/mpegts.c
libavformat/mxf.c
libavformat/mxfdec.c
libavformat/mxfenc.c
libavformat/nsvdec.c
libavformat/nut.c
libavformat/oggenc.c
libavformat/pmpdec.c
libavformat/rawdec.c
libavformat/rawenc.c
libavformat/riff.c
libavformat/sdp.c
libavformat/utils.c
libavformat/vocenc.c
libavformat/wtv.c
libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-07 22:45:46 +02:00
Michael Niedermayer
bc773d0d42
Merge commit 'f5d2c597e99af218b0d4d1cf9737c7e68ee934e4'
...
* commit 'f5d2c597e99af218b0d4d1cf9737c7e68ee934e4':
build: fix library installation on cygwin
mpc8: add a flush function
mpc8: set packet duration and stream start time instead of tracking frames
Conflicts:
libavformat/mpc8.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-07 21:49:00 +02:00
Michael Niedermayer
8993c25695
avidec: fix AVStream.info memleak with dv.
...
Fixes Ticket1334
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-07 19:18:53 +02:00
Anton Khirnov
36ef5369ee
Replace all CODEC_ID_* with AV_CODEC_ID_*
2012-08-07 16:00:24 +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
2fa57c9daf
mpc8: set packet duration and stream start time instead of tracking frames
...
Fixes mpc8 timestamps.
2012-08-06 14:39:21 -04: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
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
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
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
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
Moritz Bunkus
fe40dc1cec
matroskaenc: Implement support for ALAC
2012-08-05 18:34:28 +02: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
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
9bece76009
lavf/img2dec: add start_number_range option
2012-08-05 15:45:48 +02:00
Michael Niedermayer
9e1c55cfde
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>
2012-08-05 05:08:15 +02:00
Stefano Sabatini
b0d23ae208
lavf/img2doc: document options
2012-08-05 00:47:48 +02:00
Stefano Sabatini
b5c7318bd7
lavf/img2dec: improve error logging in case of find_image_range() failure
2012-08-05 00:38:17 +02:00
Stefano Sabatini
2dfee8abf1
lavf/img2dec: sort options by name
2012-08-05 00:38:16 +02:00
Stefano Sabatini
48c1d1d3fa
lavf/img2dec: introduce and use FIRST_INDEX_SEARCH_RANGE macro in find_image_range
2012-08-05 00:38:16 +02:00
Stefano Sabatini
07ef7b1a30
lavf/img2dec: fix out-of-range check in find_image_range()
...
Take the new parameter start_index into account.
2012-08-05 00:38:05 +02:00
Stefano Sabatini
59e4e40673
lavf/img2dec: doxygen find_image_range() function
2012-08-05 00:38:05 +02:00
Stefano Sabatini
e408e329d2
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.
2012-08-05 00:37:39 +02:00
Stefano Sabatini
a30e776ff1
lavf/img2dec: fix weird start_number count logic
...
This seems consistent with the assumed meaning of the option.
2012-08-05 00:26:48 +02:00
Philip Langdale
7b24be557f
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>
2012-08-04 12:01:24 -07:00
Philip Langdale
18175ca9b2
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>
2012-08-04 12:01:24 -07:00
Michael Niedermayer
759901f817
mpegdemux: support MLP/AOB
...
Fixes issue1731
Based-on-patch-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-04 19:37:24 +02:00
Michael Niedermayer
ce7cf600be
mpegdemux: move private stream 1 handling out of mpegps_read_pes_header
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-04 19:37:23 +02:00
Michael Niedermayer
afa6afcc9f
mpegdemux: remove redundant dvd audio code
...
This is almost a revert of: (the file from the report still works)
commit 80e58c6153
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>
2012-08-04 19:37:21 +02:00
Michael Niedermayer
3e1cf49676
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>
2012-08-04 15:42:44 +02:00
Michael Niedermayer
2107009e7d
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>
2012-08-04 15:42:44 +02:00
Michael Niedermayer
b288b4c63f
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>
2012-08-04 15:42:44 +02:00
Michael Niedermayer
c91ca5b95d
lavf: move has_decode_delay_been_guessed() up to make it accessible to earlier functions
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-04 15:42:44 +02:00
Michael Niedermayer
668c873bed
matroskadec: check element size against stream limit in ebml_parse_elem()
...
Fixes Ticket1195
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-04 02:27:51 +02:00
Paul B Mahol
d84dd35f8e
paf: fix audio packet duration
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-08-03 15:18:12 +00:00