summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | lavfi/vf_delogo: use standard options parsing.Nicolas George2013-03-201-8/+3
| | |
| * | lavfi/vf_decimate: use standard options parsing.Nicolas George2013-03-201-9/+3
| | |
| * | lavfi/vf_crop: use standard options parsing.Nicolas George2013-03-201-13/+3
| | |
| * | lavfi/af_volume: use standard options parsing.Nicolas George2013-03-201-10/+4
| | |
| * | lavfi/vf_tile: use standard options parsing.Nicolas George2013-03-201-8/+4
| | |
| * | lavfi/avf_concat: use standard options parsing.Nicolas George2013-03-201-9/+3
| | |
| * | lavfi: add common code to handle options parsing.Nicolas George2013-03-202-0/+23
| | |
| * | lavf/vobsub: free index pseudo-packet.Nicolas George2013-03-201-2/+9
| | |
| * | ffmpeg: fix freeing of sub2video frame.Nicolas George2013-03-201-1/+1
| | |
| * | lavfi: add sine audio source.Nicolas George2013-03-206-2/+284
| | |
| * | lavu/opt: add AV_OPT_TYPE_DURATION.Nicolas George2013-03-204-2/+35
| | |
| * | lavfi/concat: fix silence duration computation.Nicolas George2013-03-201-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | Inside send_silence(), delta_ts was used inconsistently: sometimes as the new value, sometimes as the old value. Consistently use it as the new value, and add an argument to know the last segment duration.
| * | lavf/concatdec: support seeking.Nicolas George2013-03-202-2/+99
| | |
* | | matroskadec: Add support for parsing Matroska ContentEncKeyIDFrank Galligan2013-03-202-5/+57
|/ / | | | | | | | | | | | | | | | | This patch adds the enums for the ContentEncryption elements. This patch also adds support for parsing the ContentEncKeyID. The ContentEncKeyID is then base64 encoded and stored in the stream's metadata. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat: Fix infinite probing that reads the whole fileMichael Niedermayer2013-03-201-0/+2
| | | | | | | | | | | | | | Fixes: otonajoshi_avformat_tries_to_load_whole.ts Reported-by: JEEB (on IRC) Thanks-to: nevcairiel Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | av_find_stream_info: change read_size to 64bitMichael Niedermayer2013-03-201-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2013-03-204-11/+31
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * cigaes/master: lavu/frame: use channels rather than channel_layout. lavf: avformat_seek_file(): validate stream_index. lavf/concatdec: fix possible leak in case of malloc failure. lavfi/buffersink: check av_frame_ref() failure. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavu/frame: use channels rather than channel_layout.Nicolas George2013-03-201-5/+16
| | |
| * | lavf: avformat_seek_file(): validate stream_index.Nicolas George2013-03-201-0/+2
| | |
| * | lavf/concatdec: fix possible leak in case of malloc failure.Nicolas George2013-03-201-5/+11
| | | | | | | | | | | | Fix CID 747737.
| * | lavfi/buffersink: check av_frame_ref() failure.Nicolas George2013-03-201-1/+2
| | |
* | | libavcodec/mips: fix for mips optimized fp fft with hard coded tables disabledNedeljko Babic2013-03-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Floating point FFT (nips optimized) breaks when hard coded tables are not enabled because MIPS optimization of floating point FFT uses only ff_init_ff_cos_tabs(16) which is not enabled by default in that case. This patch is fixing it. Signed-off-by: Nedeljko Babic <nbabic@mips.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avutil/atomic: use av_assert0()Michael Niedermayer2013-03-201-3/+3
| | | | | | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | | avutil: fix compilationMichael Niedermayer2013-03-201-0/+1
|/ / | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/showwaves: make use of AV_OPT_TYPE_VIDEO_RATEPaul B Mahol2013-03-201-18/+3
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | lavu/opt: add AV_OPT_VIDEO_RATE optionPaul B Mahol2013-03-204-2/+67
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | mips: Optimization of IIR filter functionBojan Zivkovic2013-03-206-2/+243
| | | | | | | | | | | | Signed-off-by: Bojan Zivkovic <bojan@mips.com> Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mips: Optimization of AAC coefficients encoder functionsBojan Zivkovic2013-03-205-0/+2505
| | | | | | | | | | | | Signed-off-by: Bojan Zivkovic <bojan@mips.com> Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2013-03-201-1/+1
|\ \ | |/ | | | | | | | | | | * qatar/master: rtmp: Pass the parameters to do_adobe_auth in the right order Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * rtmp: Pass the parameters to do_adobe_auth in the right orderMartin Storsjö2013-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | do_adobe_auth takes the parameters in the order "opaque, challenge". Due to the way they are treated, this didn't matter in the tested setups though - if both are set, we only use one. In the tested setups (Wowza and Akamai) either one of them were null or they were both set to the same value, which is why this worked before. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'c3ebfcd6e1327ca7bbcaee822e593c2da6cfd352'Michael Niedermayer2013-03-202-22/+21
|\ \ | |/ | | | | | | | | | | | | * commit 'c3ebfcd6e1327ca7bbcaee822e593c2da6cfd352': mpegvideo: allocate hwaccel privdata after the frame buffer h264: allocate hwaccel privdata after the frame buffer Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: allocate hwaccel privdata after the frame bufferHendrik Leppkes2013-03-191-14/+12
| | | | | | | | | | | | | | | | | | | | This ensures the hwaccel privdata does not leak when a frame buffer could not be allocated (and toggle the assert when the frame is re-used). Having no frame buffer available is quite common when using the DXVA2 hwaccel in situations where the DXVA2 renderer is being re-allocated, for example when moving between displays. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * h264: allocate hwaccel privdata after the frame bufferHendrik Leppkes2013-03-191-8/+9
| | | | | | | | | | | | | | | | | | | | This ensures the hwaccel privdata does not leak when a frame buffer could not be allocated (and toggle the assert when the frame is re-used). Having no frame buffer available is quite common when using the DXVA2 hwaccel in situations where the DXVA2 renderer is being re-allocated, for example when moving between displays. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'c71c80f53b6a63fd6360d9de5a262f9e7c85681f'Michael Niedermayer2013-03-201-0/+1
|\ \ | |/ | | | | | | | | | | * commit 'c71c80f53b6a63fd6360d9de5a262f9e7c85681f': pthread: unref already decoded frames when flushing the decoder Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pthread: unref already decoded frames when flushing the decoderHendrik Leppkes2013-03-191-0/+1
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '4e70d66ded537cadd32dbd02a38c3d86a203c812'Michael Niedermayer2013-03-202-14/+28
|\ \ | |/ | | | | | | | | | | | | * commit '4e70d66ded537cadd32dbd02a38c3d86a203c812': mpegvideo: fix allocation of the hwaccel_picture_private data lavc: update the doxy for avcodec_decode_{video,audio} wtih refcounting. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: fix allocation of the hwaccel_picture_private dataHendrik Leppkes2013-03-191-3/+5
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * lavc: update the doxy for avcodec_decode_{video,audio} wtih refcounting.Anton Khirnov2013-03-191-11/+23
| |
* | Merge commit '6599b087de62a5f9f2a8d61a1952d777d1bff804'Michael Niedermayer2013-03-202-4/+4
|\ \ | |/ | | | | | | | | | | | | * commit '6599b087de62a5f9f2a8d61a1952d777d1bff804': buffersrc: fix a typo. lavc, lavfi: fix counting number of planes in AVBufferRef wrappers Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * buffersrc: fix a typo.Anton Khirnov2013-03-191-1/+1
| | | | | | | | Vertical shift is log2_chroma_h, not log2_chroma_w.
| * lavc, lavfi: fix counting number of planes in AVBufferRef wrappersAnton Khirnov2013-03-192-4/+4
| | | | | | | | | | | | Number of planes is not always equal to the number of components even for formats marked with PIX_FMT_PLANAR -- e.g. NV12 has three components in two planes.
* | Merge commit '2c328a907978b61949fd20f7c991803174337855'Michael Niedermayer2013-03-205-10/+26
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '2c328a907978b61949fd20f7c991803174337855': pixdesc: add a function for counting planes in a pixel format. avplay: remove the -debug option. Revert "asfenc: return error on negative timestamp" Conflicts: doc/APIchanges doc/ffplay.texi ffplay.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * pixdesc: add a function for counting planes in a pixel format.Anton Khirnov2013-03-194-1/+25
| |
| * avplay: remove the -debug option.Anton Khirnov2013-03-192-12/+0
| | | | | | | | | | It just shadows the corresponding AVOption and prevents using named constants.
| * Revert "asfenc: return error on negative timestamp"Anton Khirnov2013-03-191-8/+0
| | | | | | | | | | This reverts commit d1bec33b46091546c5b2e6815210e73f87abf413, it breaks FATE.
* | vc1dec: interlaced B-framesSebastian Sandberg2013-03-201-57/+418
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | er: set error_occured on missing slicesMichael Niedermayer2013-03-201-1/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fate: make metadata fate tests only output ts and metadata.Clément Bœsch2013-03-203-525/+524
| | | | | | | | | | The other information are just cluttering the output. The command line is also simplified in the process.
* | lavc/utils: add VP6F hack for setting correct video size in streamStefano Sabatini2013-03-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some obscure reasons avcodec_set_dimensions() resets the width/height so that the resulting value set in the stream is equal to the corresponding coded_width/height, which is not the same as the correct width/height in case of the H.264 and VP6F codecs. This adds a codec-specific hack for VP6F which disables the call to avcodec_set_dimensions() in avcodec_open2(), like it is done with H264. A proper fix needs to be found yet. Fix trac ticket #1386. Based on a patch by Michael Niedermayer. Trolled-By: Daemon404 See thread: Subject: [FFmpeg-devel] [PATCH] ffprobe: Stash and use width and height before opening the codec Date: Fri, 1 Mar 2013 10:41:34 -0500
* | lavd/dshow: fix style and typo recently introduced.Clément Bœsch2013-03-191-3/+3
| |
OpenPOWER on IntegriCloud