aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* avformat/mp3enc: Squeeze our mp3 encoder tag into the 9byte shortname instead...Michael Niedermayer2014-10-241-1/+6
* Merge commit 'ef363ebd596da18f889a7d4845023a23dfac84c9'Michael Niedermayer2014-10-243-46/+128
|\
| * mp3enc: write full LAME frameAnton Khirnov2014-10-242-34/+129
* | Merge commit '88b32673db39440422a73ec3047d3326c96b4fb2'Michael Niedermayer2014-10-241-0/+20
|\|
| * avconv: copy stream-level side data when streamcopyingAnton Khirnov2014-10-241-0/+20
* | Merge commit 'c63418e0a3afbcdbc59fd65c270d45efafe092ce'Michael Niedermayer2014-10-241-17/+25
|\|
| * doc: reword the mp3 muxer documentationAnton Khirnov2014-10-241-17/+25
* | Merge commit '99143140dea12363af680d02e23cb42cfe191679'Michael Niedermayer2014-10-241-2/+3
|\|
| * mp3dec: fix reading the Xing tagAnton Khirnov2014-10-241-1/+3
* | Merge commit '6df9d9b55d3f56ee7782639a7678eeeaf77f14ea'Michael Niedermayer2014-10-245-17/+17
|\|
| * lavf: Use av_gettime_relativeMartin Storsjö2014-10-246-17/+17
* | Merge commit 'd0c093021943e9b9c23528b12cd61ca2a5b01b4f'Michael Niedermayer2014-10-241-1/+1
|\|
| * avconv: Use av_gettime_relativeMartin Storsjö2014-10-241-6/+6
* | Merge commit '248d8fb60c59c8e044d9c8f78f23383b7cdecf72'Michael Niedermayer2014-10-240-0/+0
|\|
| * avplay: Use av_gettime_relativeMartin Storsjö2014-10-241-12/+12
* | Merge commit 'e205429fcf9de3182bce2f4cfd1d6401596a8666'Michael Niedermayer2014-10-240-0/+0
|\|
| * tools: Use av_gettime_relativeOlivier Langlois2014-10-241-2/+2
* | Merge commit '6fdf35fe35d8c1c467708238100648a7a47c930d'Michael Niedermayer2014-10-240-0/+0
|\|
| * lavc: Use av_gettime_relativeOlivier Langlois2014-10-242-6/+6
* | Merge commit '1bd0bdcdc236099d5c0d179696951f35f5310fa5'Michael Niedermayer2014-10-243-4/+4
|\|
| * lavu: Add av_gettime_relativeMartin Storsjö2014-10-244-7/+27
* | avformat/rtsp: pass return code from ffurl_open() on its failureAndrey Utkin2014-10-231-3/+4
* | avformat/rtsp: add av_assert0() to clarify that the else case is supposed to ...Michael Niedermayer2014-10-231-0/+2
* | Merge remote-tracking branch 'cehoyos/master'Michael Niedermayer2014-10-231-0/+2
|\ \
| * | Print an error if -r and -vsync 0 are used together.Carl Eugen Hoyos2014-10-231-0/+2
* | | avcodec/utils: Print the codec name that is missing on the whitelistMichael Niedermayer2014-10-231-1/+1
* | | avcodec/options_table: Fix codec_whitelist flagsMichael Niedermayer2014-10-231-1/+1
|/ /
* | avformat/http: pass return code from http_open_cnx_internal() on its failureAndrey Utkin2014-10-231-0/+2
* | avformat/concatdec: Forward whitelists to the subdemuxers.Michael Niedermayer2014-10-231-0/+5
* | Forward whitelists to the asf demuxerMichael Niedermayer2014-10-231-0/+6
* | avformat/avidec: Forward whitelists to the subtitle demuxerMichael Niedermayer2014-10-231-2/+7
* | avformat/mpeg: Forward whitelists to the mpegps demuxerMichael Niedermayer2014-10-231-0/+8
* | avformat/libquvi: Forward whitelists to subdemuxerMichael Niedermayer2014-10-231-0/+5
* | x86/hpeldsp: fix loop in {avg,avg_no_rnd}_pixels16_x2_mmxJames Almer2014-10-231-15/+16
* | avformat/sapdec: Forward whitelists to sdp demuxerMichael Niedermayer2014-10-231-0/+6
* | avformat/hls: forward whitelists to mpegts demuxerMichael Niedermayer2014-10-231-0/+5
* | avutil/avstring: fix hardcoded separator in av_match_list()Michael Niedermayer2014-10-231-4/+4
* | avutil/avstring: Reimplement av_match_list()Michael Niedermayer2014-10-231-15/+14
* | avformat/format: Use av_match_name() instead of list in av_match_ext()Michael Niedermayer2014-10-231-1/+1
* | Added STL demuxer and decoderEejya Singh2014-10-2214-5/+208
* | ffserver_conf: factorize parse function per config tagLukasz Marek2014-10-222-585/+546
* | ffserver_config: clean up variable initializationLukasz Marek2014-10-221-11/+5
* | ffserver: move configuration code to separate fileLukasz Marek2014-10-224-1118/+1194
* | avcodec/tiffenc: properly compute packet sizeChristophe Gisquet2014-10-221-3/+3
* | ffmpeg: avoid endlessly reading from one input while another is unavailableMichael Niedermayer2014-10-221-2/+2
* | avformat/mux: Fix assertion failure due to max_interleave_delta and poor inputMichael Niedermayer2014-10-221-1/+9
* | avfilter/vf_idet: Fixes issue with idet not flushing last frame.Neil Birkbeck2014-10-223-1/+33
* | avformat/matroskadec: Fix cluster parsing loop which gathers seek informationMichael Niedermayer2014-10-221-2/+2
* | tools/crypto_bench: add CAST5 supportJames Almer2014-10-211-0/+45
* | avcodec/mjpegdec: use FF_CEIL_RSHIFT() for widthMichael Niedermayer2014-10-221-1/+1