summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'Michael Niedermayer2012-12-2135-40/+41
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '511cf612ac979f536fd65e14603a87ca5ad435f3': miscellaneous typo fixes Conflicts: libavcodec/4xm.c libavcodec/lagarith.c libavcodec/parser.c libavcodec/ratecontrol.c libavcodec/shorten.c libavcodec/vda_h264.c libavformat/dvenc.c libavformat/wtv.c tools/patcheck Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * miscellaneous typo fixesDiego Biurrun2012-12-2151-60/+61
| |
* | Merge commit '6906b19346ae8a330bfaa1c16ce535be10789723'Michael Niedermayer2012-12-2141-943/+1277
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6906b19346ae8a330bfaa1c16ce535be10789723': lavc: add missing files for arm lavc: introduce VideoDSPContext Conflicts: configure libavcodec/arm/dsputil_init_armv5te.c libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/dsputil_template.c libavcodec/h264.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/x86/dsputil_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: add missing files for armLuca Barbato2012-12-202-0/+59
| | | | | | | | Across the many retouches those did not make the main commit.
| * lavc: introduce VideoDSPContextRonald S. Bultje2012-12-2037-927/+1189
| | | | | | | | | | | | | | | | 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>
* | alsdec: cosmetics after previous commitPaul B Mahol2012-12-211-8/+8
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | alsdec: channel sortingPaul B Mahol2012-12-211-3/+13
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'a925f723a915bc0255e2673f8817af5212131763'Michael Niedermayer2012-12-213-5/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * commit 'a925f723a915bc0255e2673f8817af5212131763': rtp: Don't read priv_data unless it is allocated flvenc: Check whether seeking back to the header succeeded sapenc: Pass the title on to the chained muxers Conflicts: libavformat/flvenc.c libavformat/sapenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtp: Don't read priv_data unless it is allocatedMartin Storsjö2012-12-201-1/+1
| | | | | | | | | | | | | | 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>
| * flvenc: Check whether seeking back to the header succeededBjörn Axelsson2012-12-201-4/+8
| | | | | | | | | | | | | | | | 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>
| * sapenc: Pass the title on to the chained muxersJernej Virag2012-12-201-0/+5
| | | | | | | | | | | | | | 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>
* | lavf: Remove "Adjusting PTS forward" codeMichael Niedermayer2012-12-211-14/+0
| | | | | | | | | | | | | | it causes problems (incorrectly detect TS discontinuities) with a brokan TS file (test-audio-broken.ts) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | gifdec: remove dead storePaul B Mahol2012-12-211-1/+0
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | ffplay: fix handling of resolution changes with h264-mtMichael Niedermayer2012-12-211-7/+7
| | | | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Reviewed-by: Marton Balint <cus@passwd.hu> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix compilation with --disable-everything --enable-muxer=mov.Carl Eugen Hoyos2012-12-211-1/+1
| |
* | lavf/hlsenc: provide some feedback in case of invalid basenameStefano Sabatini2012-12-211-1/+3
| |
* | lavf/hlsenc: fix minor grammar inconsistencies in the option help messagesStefano Sabatini2012-12-211-4/+4
| |
* | doc: remove inclusion of libav* documentation in toolsStefano Sabatini2012-12-204-32/+0
| | | | | | | | | | | | | | | | | | This shrinks the tool manuals to a manageable size. Relevant manuals are referenced in the "See Also" chapter. Overall documentation inclusion should still be possible through the use of a conditional variable set during configuration time, if someone feels the need for a huge-wall-of-text-fashioned manual.
* | doc/ffmpeg-formats: include metadata chapterStefano Sabatini2012-12-201-0/+1
| | | | | | | | The metadata muxer/demuxer belongs to the formats documentation.
* | Always write all colours for animated gif files, including transparent ones.Carl Eugen Hoyos2012-12-201-2/+3
| | | | | | | | | | | | This fixes the colour of the transparent background (as seen with ffplay), and makes the background of some non-keyframes transparent that was incorrectly shown as opaque for some samples.
* | gifdec: fix invalid write in gif_copy_img_rectPaul B Mahol2012-12-201-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | gifdec: fix invalid write in giff_fill_rectPaul B Mahol2012-12-201-1/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | ffmpeg_opt: fix recording time in->out carryover.Michael Niedermayer2012-12-201-9/+11
| | | | | | | | | | | | This should fix valgrind complaints. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/af_aconvert: update audio->channels.Nicolas George2012-12-201-0/+1
| |
* | tiffdec: support LZW compression with inverted FillOrderPiotr Bandurski2012-12-201-0/+14
| |
* | lavf/srtdec: reindent after previous commits.Clément Bœsch2012-12-201-29/+29
| |
* | lavf/srtenc: honor subtitle position side data.Clément Bœsch2012-12-201-1/+16
| |
* | lavf/srtdec: switch to FFDemuxSubtitlesQueue API.Clément Bœsch2012-12-201-23/+62
| |
* | lavf: split packets before muxing.Clément Bœsch2012-12-201-4/+20
| | | | | | | | | | | | | | | | 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.
* | aiffenc: set correct number of bits foru8 in aiffPiotr Bandurski2012-12-202-2/+1
| | | | | | | | | | | | with this change QuickTime is able to play u8 aiff file generated by FFmpeg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi: remove init and check of rate and layout.Nicolas George2012-12-201-9/+0
| | | | | | | | | | The sample rate and channel layout are negotiated and set by the filter graph system.
* | lavfi/buffersrc: remove init of rate and layout.Nicolas George2012-12-201-2/+0
| | | | | | | | | | The sample rate and channel layout are negotiated and set by the filter graph system, the filters must not set them.
* | lavfi: add an accessor for ref->audio->channels.Nicolas George2012-12-204-3/+17
| |
* | lavfi: add a channels field to AVFilterLink.Nicolas George2012-12-206-2/+22
| | | | | | | | | | Also: fix af_pan and af_aresample, that forgot to update audio->channels.
* | h264: Fix code to also handle pix format changes.Michael Niedermayer2012-12-201-4/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-12-2012-15/+586
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * 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>
| * lavr: add option for dithering during sample format conversion to s16Justin Ruggles2012-12-1910-12/+583
| |
| * mpeg12: do not decode extradata more than once.Anton Khirnov2012-12-192-1/+3
| | | | | | | | | | | | Fixes CVE-2012-2803. CC: libav-stable@libav.org
* | Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011'Michael Niedermayer2012-12-206-26/+25
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * cmdutils: pass number of groups to split_commandline().Anton Khirnov2012-12-193-16/+14
| | | | | | | | | | This makes the code simpler and avoids mixing designated and non-designated initializers in a potentially unsafe way in avconv.
| * mov: handle h263 and flv1 for codec_tag 'H','2','6','3'Janne Grunau2012-12-192-1/+5
| | | | | | | | | | | | | | | | | | | | The sample in https://bugzilla.libav.org/show_bug.cgi?id=393 and samples/F4V/H263_NM_f.mp4 both have codec_tag H263 for different codecs. H263 is apparently used by Flash Media Server for Sorensen Spark videos. Patch based on commit 5442083b1c541dd166b3adf39131259fc846a62b by Carl Eugen Hoyos. Fixes bug 393.
| * h264: fix sps parsing for SVC and CAVLC 4:4:4 Intra profilesVictor Lopez2012-12-191-1/+5
| | | | | | | | | | | | Fixes bug 396. CC: libav-stable@libav.org
* | lavfi/select: fix compilation with avcodec disabled.Clément Bœsch2012-12-201-2/+8
| |
* | astenc: Remove two AVRationals with denominator 1James Almer2012-12-201-1/+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>
* | h264: remove unused variableMichael Niedermayer2012-12-201-1/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg_opt: fix pointer typesMichael Niedermayer2012-12-201-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegvideo: increase scratchpad sizesMichael Niedermayer2012-12-201-1/+1
| | | | | | | | | | | | | | These where reduced in f1d8763a02b5fce9a7d9789e049d74a45b15e1e8 and this change can cause out of array accesses. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/general: sort subtitles formats.Clément Bœsch2012-12-201-2/+2
| |
* | fate: add and fix subtitles dependencies.Clément Bœsch2012-12-201-10/+11
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-12-202-14/+23
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 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>
OpenPOWER on IntegriCloud