Paul B Mahol
9321e93502
gifdec: fix invalid write in gif_copy_img_rect
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Paul B Mahol
c004de0b1c
gifdec: fix invalid write in giff_fill_rect
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago
Michael Niedermayer
103410d67e
ffmpeg_opt: fix recording time in->out carryover.
...
This should fix valgrind complaints.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Nicolas George
c7a1239bf9
lavfi/af_aconvert: update audio->channels.
12 years ago
Piotr Bandurski
17714adbf8
tiffdec: support LZW compression with inverted FillOrder
12 years ago
Clément Bœsch
217bdd08e3
lavf/srtdec: reindent after previous commits.
12 years ago
Clément Bœsch
6c26fc7704
lavf/srtenc: honor subtitle position side data.
12 years ago
Clément Bœsch
1dab8d9157
lavf/srtdec: switch to FFDemuxSubtitlesQueue API.
12 years ago
Clément Bœsch
0072116ccb
lavf: split packets before muxing.
...
After demuxing, data and side are merged. Before decoding, they are
split. Encoder will perform with data and side split. This means that a
muxer can receive split data (after encoding) but also merged data (if
called directly after demuxing). This commit makes sure data and side
are split for the muxer.
12 years ago
Piotr Bandurski
52f2176366
aiffenc: set correct number of bits foru8 in aiff
...
with this change QuickTime is able to play u8 aiff file generated by FFmpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Luca Barbato
6906b19346
lavc: add missing files for arm
...
Across the many retouches those did not make the main commit.
12 years ago
Ronald S. Bultje
8c53d39e7f
lavc: introduce VideoDSPContext
...
Move some functions from dsputil. The idea is that videodsp contains
functions that are useful for a large and varied set of video decoders.
Currently, it contains emulated_edge_mc() and prefetch().
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
12 years ago
Martin Storsjö
a925f723a9
rtp: Don't read priv_data unless it is allocated
...
This makes all users of rtpenc_chain (rtsp muxer, sapenc, mov
rtp hinting) work again, broken since 8034130e0
.
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
Nicolas George
0146c1f0f1
lavfi: remove init and check of rate and layout.
...
The sample rate and channel layout are negotiated and set
by the filter graph system.
12 years ago
Nicolas George
5033a1af17
lavfi/buffersrc: remove init of rate and layout.
...
The sample rate and channel layout are negotiated and set
by the filter graph system, the filters must not set them.
12 years ago
Nicolas George
34de47aa35
lavfi: add an accessor for ref->audio->channels.
12 years ago
Nicolas George
238edd2fe3
lavfi: add a channels field to AVFilterLink.
...
Also: fix af_pan and af_aresample, that forgot to update
audio->channels.
12 years ago
Michael Niedermayer
a9275b4f69
h264: Fix code to also handle pix format changes.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
41135b7f64
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavr: add option for dithering during sample format conversion to s16
mpeg12: do not decode extradata more than once.
Conflicts:
libavcodec/mpeg12.c
libavcodec/mpeg12.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
40ea343866
Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'
...
* commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011':
cmdutils: pass number of groups to split_commandline().
mov: handle h263 and flv1 for codec_tag 'H','2','6','3'
h264: fix sps parsing for SVC and CAVLC 4:4:4 Intra profiles
Conflicts:
libavcodec/h264_ps.c
libavformat/isom.c
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Björn Axelsson
1eaff98c83
flvenc: Check whether seeking back to the header succeeded
...
The FLV muxer tries to update the header in write_trailer, which is
impossible if writing to a pipe or network stream. Don't write header
data if seeking to the header fails.
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
Jernej Virag
e30e8e311e
sapenc: Pass the title on to the chained muxers
...
This makes sure it ends up in the SDP, providing a proper session name
in the SAP announcements.
Signed-off-by: Martin Storsjö <martin@martin.st>
12 years ago
Clément Bœsch
174c483e2e
lavfi/select: fix compilation with avcodec disabled.
12 years ago
James Almer
974ac57e83
astenc: Remove two AVRationals with denominator 1
...
They are completely superfluous when using av_rescale_q_rnd().
Call av_rescale_rnd() using what used to be the numerators instead.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
8525fa7c2c
h264: remove unused variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
a46c565796
ffmpeg_opt: fix pointer types
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
73db0bf1b0
mpegvideo: increase scratchpad sizes
...
These where reduced in f1d8763a02
and this change can cause out of array accesses.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Clément Bœsch
53fa6f5863
doc/general: sort subtitles formats.
12 years ago
Clément Bœsch
e5e5664ca0
fate: add and fix subtitles dependencies.
12 years ago
Michael Niedermayer
7e90053822
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mpegvideo: increase edge_emu_buffer size for VC1
lavc: merge latest x86inc.asm fixes with x264
Conflicts:
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
1667152a9c
Merge commit 'acb571c89a065d943163c11efb46de35774f1909'
...
* commit 'acb571c89a065d943163c11efb46de35774f1909':
avcodec: bump minor for adaptive h264 frame-mt
avconv: pass the actually selected decoder to filter_codec_opts().
Conflicts:
Changelog
ffmpeg_opt.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
ba4bcb191a
cmdutils: implement debug/fdebug log level update differently.
...
The old implementation is no longer possibly due to limitations
of the new command line parser.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
af4b1c02ac
Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'
...
* commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06':
avconv: use new options parser.
Conflicts:
ffmpeg.c
ffmpeg.h
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Justin Ruggles
b2fe6756e3
lavr: add option for dithering during sample format conversion to s16
12 years ago
Clément Bœsch
52b866471e
doc/faq: move filter links to the ffmpeg-filters.html page.
12 years ago
Clément Bœsch
521a963a7d
doc/faq: improve concatenation entry.
12 years ago
Clément Bœsch
cb0881c794
ffmpeg: use GROW_ARRAY in opt_map_channel.
12 years ago
Michael Niedermayer
61bc3d80e9
Merge commit '0ec1642b60a5b1a4d913e2b9e3899173dff77e7a'
...
* commit '0ec1642b60a5b1a4d913e2b9e3899173dff77e7a':
cmdutils: don't log an error in opt_default().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
33f9b2436a
Merge commit '8c9af5b2051b9927f845c7afdfeb30b82670ee77'
...
* commit '8c9af5b2051b9927f845c7afdfeb30b82670ee77':
cmdutils: add a commandline pre-parser.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Anton Khirnov
5823686261
mpeg12: do not decode extradata more than once.
...
Fixes CVE-2012-2803.
CC: libav-stable@libav.org
12 years ago
Michael Niedermayer
465c7de792
Merge commit 'a01c02bcff755a7891f777706b27452203aac71e'
...
* commit 'a01c02bcff755a7891f777706b27452203aac71e':
cmdutils: split parse_option().
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Anton Khirnov
c661cb6672
cmdutils: pass number of groups to split_commandline().
...
This makes the code simpler and avoids mixing designated and
non-designated initializers in a potentially unsafe way in avconv.
12 years ago
Michael Niedermayer
330983b728
Merge commit '10bca66101b79954512cd9d8ee20c3bc4513adf3'
...
* commit '10bca66101b79954512cd9d8ee20c3bc4513adf3':
cmdutils: add a macro to simplify grow_array() calls.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
f61498e1df
Merge commit '9e696d2e5ffaa763c564682ec18c3b51b3e5fccc'
...
Merge only for metadata, functionality had been previously integrated.
* commit '9e696d2e5ffaa763c564682ec18c3b51b3e5fccc':
h264: support frame parameter changes during frame-mt
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
ca4dd3810e
h264: use must_reinit to simplify code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
af0fafcb6f
h264: decode_update_thread_context() copy parameter sets before using them
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
e33811bd26
h264: remove reschange blocking
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
c2dfb1e37c
h264: support frame size changes with multi threading
...
Based on code by Janne Grunau
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
7e6c68394f
ffmpeg_filter: use frame instead of decoder context pixel format
...
prevents regressions from h264-mt frame size changing code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
04a530f7d3
ffmpeg_filter: use frame dimensions instead of decoder context dimensions.
...
avoids regression from the h264-mt frame size change code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago