summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* avformat/mmst: propagate error code from avio_put_str16le()Michael Niedermayer2013-11-13
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* doc: remove soc.txtTimothy Gu2013-11-13
| | | | | | | | The file was written in 2006, it was never updated nor really used as reference for SOC-like programs. Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* lavd/xv: fix memory leakLukasz Marek2013-11-13
| | | | | | Results of XvQueryAdaptors have to be freed with XvFreeAdaptorInfo. Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
* lavfi: add elbg filterStefano Sabatini2013-11-13
|
* lavc/elbg: rename ff_ symbols to avpriv_, so they can be used in shared libsStefano Sabatini2013-11-13
| | | | | In particular, allows the use of elbg in other FFmpeg libraries, required by the pending elbg filter.
* vorbis: handle special packets in the middle of a streamBen Boeckel2013-11-13
| | | | | | | | | | | This allows for updating metadata from new metadata packets in the middle of a stream (e.g., MPD streams). There still needs to be a signal that there *is* new metadata, but this is at least gets the data into a data structure. Signed-off-by: Ben Boeckel <mathstuf@gmail.com> Reviewed-by: wm4 <nfxjfg@googlemail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/vqf: check a few more bits in probeMichael Niedermayer2013-11-13
| | | | | | | | Fixes probetest failure The threshold is choosen so that a all printale ascii string will never be detected as vqf Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/vp9: use av_freep() for above_partition_ctxPaul B Mahol2013-11-12
| | | | | | Fixes use after free if memory allocation fails. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avformat/smacker: check width/height in probeMichael Niedermayer2013-11-12
| | | | | | Fixes probetest failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/mpegvideo_motion: Handle edge emulation even without unrestricted_mvMichael Niedermayer2013-11-12
| | | | | | | Fixes out of array reads Fixes part of: MSVR 440 (the other issues seem to have been fixed already) Found-by: Jeremy Brown (jerbrown) of ReSP Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* MAINTAINERS: Add 1.2 back to the maintained releasesMichael Niedermayer2013-11-12
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Fix example in pullup documentation.Lou Logan2013-11-12
| | | | | | | The pullup filter does not work well with the fps filter, it currently needs -r Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
* libavcodec/xsubenc.c: set coded_bits_per_sampleErik Olofsson2013-11-12
| | | | | | | | | | | Explicitly set the number of bits per sample to stop the avi muxer from guessing at 24 bits. The result is that bits per pixel in the avi stream header matches what other XSUB muxers produce, such as AVIAddXSubs.exe Signed-off-by: Erik Olofsson <eaj.olofsson@gmail.com> Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* libavcodec/xsubenc.c: Fix bounding box coordinatesErik Olofsson2013-11-12
| | | | | | | | | | | | | | | | | Fix coordinates of the lower right corner of the text area. Note that the coordinates are redundant as the size and position of the text area are known. Many decoders (including Sony Playstation 3, VLC and FFmpeg) ignore the redundant coordinates. Some hardware decoders need them for correct playback. Verified on Philips DVD player models HTS7201 and DVP3380. Fixes ticket #3031 Signed-off-by: Erik Olofsson <eaj.olofsson@gmail.com> Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'cus/stable'Michael Niedermayer2013-11-11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cus/stable: libzvbi-teletextdec: propagate errors generated in page handler libzvbi-teletextdec: dont ignore memory allocation error silently libzvbi-teletextdec: output ass subtitles instead of plain text ass: move text_event_to_ass from textdec.c to ass.c and export it ass: fix error handling in ff_ass_add_subrect ass: factor out ff_ass_bprint_dialog libzvbi-teletextdec: use AVBPrint for whitespace cleanup libzvbi-teletextdec: use option constants instead of strings libzvbi-teletextdec: fix indentation after last commit libzvbi-teletextdec: support multiple teletext pages in a single packet Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * libzvbi-teletextdec: propagate errors generated in page handlerMarton Balint2013-11-10
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * libzvbi-teletextdec: dont ignore memory allocation error silentlyMarton Balint2013-11-10
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * libzvbi-teletextdec: output ass subtitles instead of plain textMarton Balint2013-11-10
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * ass: move text_event_to_ass from textdec.c to ass.c and export itMarton Balint2013-11-10
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * ass: fix error handling in ff_ass_add_subrectMarton Balint2013-11-10
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * ass: factor out ff_ass_bprint_dialogMarton Balint2013-11-10
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * libzvbi-teletextdec: use AVBPrint for whitespace cleanupMarton Balint2013-11-10
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * libzvbi-teletextdec: use option constants instead of stringsMarton Balint2013-11-10
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * libzvbi-teletextdec: fix indentation after last commitMarton Balint2013-11-10
| | | | | | | | Signed-off-by: Marton Balint <cus@passwd.hu>
| * libzvbi-teletextdec: support multiple teletext pages in a single packetMarton Balint2013-11-10
| | | | | | | | | | | | | | | | After this patch, if a packet contains multiple teletext pages, the teletext decoder can return the fist page and store the remaining pages in memory, and return them to the user on the next calls to avcodec_decode_subtitle2. Signed-off-by: Marton Balint <cus@passwd.hu>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpegaudioenc: Move some static tables to MpegAudioContext Conflicts: libavcodec/mpegaudioenc.c libavcodec/mpegaudiotab.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | mpegaudioenc: Move some static tables to MpegAudioContextDiego Biurrun2013-11-10
| | | | | | | | | | | | This reduces global state and the amount of globally visible tables.
* | | Merge commit '5d6a990c115850326711c2f5be4d9fd33f399616'Michael Niedermayer2013-11-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5d6a990c115850326711c2f5be4d9fd33f399616': mpegaudioenc: Remove broken integer-only quantization code path Conflicts: libavcodec/mpegaudioenc.c Mostly not merged, the integer code works fine. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | mpegaudioenc: Remove broken integer-only quantization code pathDiego Biurrun2013-11-10
| | |
* | | avformat/electronicarts: check chunksize more completely in probe()Michael Niedermayer2013-11-11
| | | | | | | | | | | | | | | | | | Fixes probetest failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/electronicarts: check chunk size.Michael Niedermayer2013-11-11
| | | | | | | | | | | | | | | | | | Fix infinite loop Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/dfa: check first frame offset in probeMichael Niedermayer2013-11-11
| | | | | | | | | | | | | | | | | | Fixes probetest failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/bethsoftvid: check 4th header byte in probeMichael Niedermayer2013-11-11
| | | | | | | | | | | | | | | | | | Fixes probetest failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/avr: check channels and bps in probeMichael Niedermayer2013-11-11
| | | | | | | | | | | | | | | | | | Fixes probetest failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avformat/utils: disabled debug code to collect format probing statisticsMichael Niedermayer2013-11-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows collecting statistics on probing scores and the amount of data probing needed for various files and formats. For example it can be used to find out which formats tend to need more data for probing or which files are probed with less certain/lower scores Reviewed-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | doc: delete viterbi.txtTimothy Gu2013-11-11
| | | | | | | | | | | | | | | | | | | | | The description has been moved to the FFmpeg wiki: https://trac.ffmpeg.org/wiki/ViterbiAlgorithm Signed-off-by: Timothy Gu <timothygu99@gmail.com>
* | | ffmpeg: remove unneeded include "libswscale/swscale.h"Michael Niedermayer2013-11-10
| | | | | | | | | | | | | | | Found-by: ramiro Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avfilter/fade: use FADE_OUT macro.Clément Bœsch2013-11-10
| | |
* | | avfilter/fade: remove a bunch of useless parenthesis.Clément Bœsch2013-11-10
| | |
* | | avfilter/fade: use inlink->frame_count.Clément Bœsch2013-11-10
| | |
* | | avfilter/fade: add color option.Clément Bœsch2013-11-10
| |/ |/| | | | | Fixes Ticket #1822.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-11-10
|\| | | | | | | | | | | | | | | | | | | * qatar/master: hwaccel: Simplify ff_find_hwaccel Conflicts: libavcodec/mpeg12dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hwaccel: Simplify ff_find_hwaccelLuca Barbato2013-11-10
| | | | | | | | It is always called by passing fields from an AVCodecContext.
* | avformat/diracdec: check 2 chunks in probeMichael Niedermayer2013-11-10
| | | | | | | | | | | | Fixes probetest failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/astdec: increase the score for odd samplerate/channels to max/8Michael Niedermayer2013-11-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rsd: increase the score for odd samplerate/channels to max/8Michael Niedermayer2013-11-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/lvfdec: increase the score for odd channels to max/8Michael Niedermayer2013-11-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/swfdec: return AVPROBE_SCORE_MAX / 4 for unexpected versionsMichael Niedermayer2013-11-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/ape: check version in probeMichael Niedermayer2013-11-10
| | | | | | | | | | | | Fixes probetest failure Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | doc/encoders: fix libfdk-aac "Examples" subsectionTimothy Gu2013-11-10
| | | | | | | | | | Signed-off-by: Timothy Gu <timothygu99@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>