49f441ea89
MAINTAINERS: Update which releases are supported
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10 00:47:01 +02:00
c3ca70204b
codec_desc: fix typo in rv20 long_name.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10 00:27:34 +02:00
3aa2257d24
doc/RELEASE_NOTES: add a note about AVISynth
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-10 00:24:04 +02:00
233177a4ec
jpegdec: clear EOBRUN on restarts
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 23:49:06 +02:00
1c032e94d0
jpegdec: give handle_rstn() a return code that indicates if restart did happen
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 23:45:31 +02:00
776155ca29
mjpeg_decode_scan: reset restart state
...
Fixes Ticket2082
Fixes progressive/refinement + restart jpegs
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 23:43:36 +02:00
e9be4675b8
doc/ffmpeg: document -override_ffserver
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 22:19:10 +02:00
325411a687
snowenc: check minimum resolution
...
Fixes Ticket1855
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 21:10:45 +02:00
aa74810fc6
bitstream: fix a crash in case of oom
...
fixes ticket #2766
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 19:41:22 +02:00
193782216f
vorbiscomment: Add support for embedded cover art
...
Fixes ticket #2655
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 19:21:23 +02:00
1e5bbbfcf3
lavf/flacdec: Share the function to parse cover art blocks
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 19:19:42 +02:00
f9d7431272
avformat/AVFormatContext: Move fields down to match the fork
...
avconv uses private and internal fields from libavformat, we thus must
match the layout even of the fields marked non public.
Otherwise ffmpegs libavformat could not be used as a dropin replacement
on debian/ubuntu
The current soname of libavformat was not part of any release nor are any
fields marked public moved thus in theory
no installed shared lib ABI breakage should occur. Still the need for this
change is unfortunate and chilling.
If you installed shared libs from a recent development version of libavformat
that is more recent than the last release. You probably want to check or rebuild
applications that linked to it.
minor versions of avformat & avdevice are bumped to allow detecting this
as both use the updated struct
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 19:06:32 +02:00
d5de123195
avfilter/graphparse: Fix build with --enable-incompatible-fork-abi
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 19:06:32 +02:00
c5a1b18f18
lavfi/drawtext: add support for printing frame metadata
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-09 15:21:01 +00:00
87fb18c3e4
imc: Catch a division by zero
...
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Reviewed-by: Kostya Shishkov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 16:20:50 +02:00
7d9cb12689
avcodec/wmaprodec: Check block_align
...
Fixes undefined behavior
Its not known if this condition can be triggered through crafted input.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 15:32:21 +02:00
694550f18e
Merge remote-tracking branch 'cehoyos/master'
...
* cehoyos/master:
Force correct extradata for AVID AVCI50 in mov.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 13:04:51 +02:00
0dd99628ea
ff_lpc_calc_coefs: assert that the type is levinson or cholesky
...
Otherwise the code could misbehave (and there are no other types anyway)
Fixes CID700759
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 11:57:45 +02:00
9a1ec1f2f2
Force correct extradata for AVID AVCI50 in mov.
...
Fixes ticket #2106 .
Reviewed-by: Kieran Kunhya
2013-07-09 11:43:33 +02:00
3c5071db88
lavfi/psnr: rename 's' parameter to match documentation
...
Also removes some irrelevant lines in documentation.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-09 09:40:53 +00:00
d0a7933991
ffmpeg_opt: do not warn about unused gop_timecode
...
The option is injected by generic code and being sometimes unused is normal.
Fixes Ticket2762
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 10:54:40 +02:00
e914a21ada
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
movenc: Rename the timestamp parameter to dts in write_hint_packets
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 10:07:23 +02:00
848295c2ee
Merge commit 'a87a0acf9b5d27aad032e61eef4973e62a4a6830'
...
* commit 'a87a0acf9b5d27aad032e61eef4973e62a4a6830':
movenc: Make sure the RTP hint tracks have nondecreasing DTS
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 10:01:17 +02:00
00b1401df6
avcodec/h264_ps: try to support Ambarella AVC
...
Fixes Ticket2763
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 05:21:26 +02:00
509642b4bd
WebM muxer writes WebVTT subtitle track
...
The Matroska muxer now allows WebVTT subtitle tracks to be written
while in WebM muxing mode.
WebVTT subtitle tracks have four kinds: "subtitles", "captions",
"descriptions", and "metadata". Each text track kind has a distinct
Mastroska CodecID and track type, as described in the temporal
metadata guidelines here:
http://wiki.webmproject.org/webm-metadata/temporal-metadata/webvtt-in-webm
When the stream has codec id AV_CODEC_ID_WEBVTT, the stream packet is
serialized per the temporal metadata guidelines cited above. The
WebVTT cue is written as a Matroska block group. The block frame
comprises the WebVTT cue id, followed by the cue settings, followed by
the cue text. (The block timestamp is synthesized from the cue
timestamp.)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 03:09:12 +02:00
a20f049c2a
avcodec/libvpxenc: make class names unique
...
This should fix an infinite loop with -h full
Found-by: <Foofie>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 03:04:31 +02:00
d1e8d4b055
ffmpeg: Allow overriding ffservers input
...
Fixes Ticket1970
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 01:50:32 +02:00
d7fbe926d3
ffmpeg: move creation_time for ffserver setting up
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-09 01:50:32 +02:00
a03e79ed5a
lavfi: fix broken logic in metadata handling
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-08 20:13:56 +00:00
970c8df735
mpeg12dec: avoid reinitializtation on PS changes when possible.
...
Fixes Ticket2574
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-08 21:55:04 +02:00
7dee9c2268
tests/fate/filter-audio: update asyncts reference
...
The new reference matches the one used by qatar
Fixes: fate-filter-asyncts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-08 19:44:27 +02:00
19c8f22714
lavfi/rotate: switch to new drawutils
...
Get rid of ugly hacks, also add support for more pixel formats.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-08 16:40:49 +00:00
55c94f48ce
lavfi/drawutils: fix planar rgb
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-08 16:40:49 +00:00
d2dd1e075c
lavfi/pad: use FFSIGN
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-08 16:40:48 +00:00
70b922f371
avformat/mov: read stream bitrates from isml manifest
...
This allows to read a live isml movie and segment it using the
smoothstreaming muxer, which requires the bitrates to be known for each stream.
Signed-off-by: Alexandre Sicard <alexandre.sicard@smartjog.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-08 17:36:45 +02:00
e096283ea5
mp3dec: detect CBR and use CBR axiom to seek
...
This should also work reasonable with truncated and growing mp3s.
Fixes Ticket2590
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-08 17:12:51 +02:00
6150bec3f8
lavfi: add psnr filter
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-07-08 14:58:04 +00:00
1ba01d3d46
swscale: treat gray as a fullrage (0-255) format
...
Fixes Ticket2684
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-08 15:21:48 +02:00
b86651a208
Check the return value of ff_rv34_decode_init() in rv30.c and rv40.c
...
Avoids possible null pointer dereferences on oom.
Fixes ticket #2727 .
2013-07-08 11:56:16 +02:00
0677ddebc6
movenc: Rename the timestamp parameter to dts in write_hint_packets
...
This matches its actual intended use better.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-08 12:44:25 +03:00
a87a0acf9b
movenc: Make sure the RTP hint tracks have nondecreasing DTS
...
The RTP timestamps can be decreasing for codecs with B-frames. For
these cases, make sure the timestamps in the MP4 file track itself
are nondecreasing, and add an offset to the RTP packet hint instead
to produce the intended RTP timestamp.
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-07-08 12:43:42 +03:00
5d3c3035b7
cmdutils: replace exit() by exit_program()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-08 11:12:32 +02:00
eeddeb6579
ffmpeg_opt: replace exit() by exit_program()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-08 11:12:32 +02:00
efce76a80d
ffmpeg_filter: replace exit() by exit_program()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-08 11:09:22 +02:00
44d0e520f8
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
qdm2: check and reset dithering index per channel
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-08 05:26:17 +02:00
e1f98f2231
Merge commit '76efedeadb1f6bf79020c44a71dd0cee13d932ad'
...
* commit '76efedeadb1f6bf79020c44a71dd0cee13d932ad':
qdm2: formatting cosmetics
Conflicts:
libavcodec/qdm2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-08 05:10:06 +02:00
d28a8ad8f3
Merge commit 'f054e309c58894450a5d18cce9799ef58aab9f14'
...
* commit 'f054e309c58894450a5d18cce9799ef58aab9f14':
qdm2: use init_static_data
westwood_vqa: do not free extradata on error in read_header
Conflicts:
libavformat/westwood_vqa.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-08 05:02:52 +02:00
b5a87dc193
Merge commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0'
...
* commit 'c4abc9098cacb227dba39bac6aea16b2bceba0d0':
vqavideo: check the version
Conflicts:
libavcodec/vqavideo.c
See: b226af3910
2013-07-08 04:53:52 +02:00
f982d006bb
Merge commit '636ced8e1dc8248a1353b416240b93d70ad03edb'
...
* commit '636ced8e1dc8248a1353b416240b93d70ad03edb':
cmdutils: wrap exit explicitly
Conflicts:
avprobe.c
cmdutils.c
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-08 04:34:11 +02:00
4cd066b69c
Merge commit '21732063a346475eb22c332b27e8216b79f9ad4a'
...
* commit '21732063a346475eb22c332b27e8216b79f9ad4a':
movenc: K&R formatting cosmetics
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-08 04:08:07 +02:00
Michael Niedermayer
Alexis Ballier
Piotr Bandurski
James Almer
Paul B Mahol
Luca Barbato
Carl Eugen Hoyos
Matthew Heaney
Alexandre Sicard
Martin Storsjö