aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'ff953fecffd3b9a616a046723fb9d4690be032a6'Michael Niedermayer2012-12-052-13/+20
|\ | | | | | | | | | | | | | | | | | | * commit 'ff953fecffd3b9a616a046723fb9d4690be032a6': lavc: set frame properties in ff_get_buffer(). Conflicts: libavcodec/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: set frame properties in ff_get_buffer().Anton Khirnov2012-12-042-25/+18
| | | | | | | | | | There is no point in duplicating this code in every get_buffer() implementation.
* | Merge commit '594d4d5df3c70404168701dd5c90b7e6e5587793'Michael Niedermayer2012-12-05168-178/+335
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '594d4d5df3c70404168701dd5c90b7e6e5587793': lavc: add a wrapper for AVCodecContext.get_buffer(). Conflicts: libavcodec/4xm.c libavcodec/8svx.c libavcodec/bmv.c libavcodec/cljr.c libavcodec/cscd.c libavcodec/dnxhddec.c libavcodec/dpcm.c libavcodec/dpx.c libavcodec/eacmv.c libavcodec/eamad.c libavcodec/frwu.c libavcodec/g723_1.c libavcodec/gifdec.c libavcodec/idcinvideo.c libavcodec/iff.c libavcodec/indeo3.c libavcodec/internal.h libavcodec/interplayvideo.c libavcodec/kmvc.c libavcodec/mpc7.c libavcodec/mpegaudiodec.c libavcodec/pcx.c libavcodec/pngdec.c libavcodec/pnmdec.c libavcodec/rl2.c libavcodec/snow.c libavcodec/targa.c libavcodec/tscc.c libavcodec/txd.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vb.c libavcodec/vmdav.c libavcodec/vp56.c libavcodec/vqavideo.c libavcodec/wavpack.c libavcodec/wnv1.c libavcodec/xl.c libavcodec/yop.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: add a wrapper for AVCodecContext.get_buffer().Anton Khirnov2012-12-04141-154/+286
| | | | | | | | It will be useful in the upcoming transition to refcounted AVFrames.
* | ircamenc: 10l do not use avio_skip()Paul B Mahol2012-12-052-2/+3
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Ensoniq Paris Audio File demuxerPaul B Mahol2012-12-056-1/+109
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | IRCAM demuxer & muxerPaul B Mahol2012-12-0512-1/+267
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | rsodec: use ff_pcm_read_packet()Paul B Mahol2012-12-051-17/+2
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | soxdec: use ff_pcm_read_packet()Paul B Mahol2012-12-051-21/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | audec: use ff_pcm_read_packet()Paul B Mahol2012-12-051-21/+2
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | pvfdec: use ff_pcm_read_packet()Paul B Mahol2012-12-051-12/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avr: use ff_pcm_read_packet()Paul B Mahol2012-12-052-3/+4
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | pcmdec: move read_packet function to pcm.c so it can be shared with other ↵Paul B Mahol2012-12-053-25/+20
| | | | | | | | | | | | | | | | | | demuxers While here remove pts/dts code, it is apparently not needed and cause problems for demuxers that will use such function. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'Michael Niedermayer2012-12-0534-105/+20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967': Remove pointless #undefs of previously forbidden functions. fate: Add dependencies for bmp, cdxl, dfa, mp3 Conflicts: doc/examples/muxing.c libavfilter/filtfmts.c libavutil/des.c libavutil/eval.c libavutil/log.c libavutil/parseutils.c tests/fate/mp3.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove pointless #undefs of previously forbidden functions.Anton Khirnov2012-12-0428-57/+0
| |
| * fate: Add dependencies for bmp, cdxl, dfa, mp3Diego Biurrun2012-12-044-8/+17
| |
* | fate: disable vf_gradfun testMichael Niedermayer2012-12-051-3/+3
| | | | | | | | | | | | The non working test interferes with other peoples work Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vc1dec: Fix null pointer dereference in vc1_decode_skip_blocks()Michael Niedermayer2012-12-051-3/+5
| | | | | | | | | | | | | | | | This handles the last frame being unavailable like all the other code in vc1dec. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/dvdsubdec: accept palette from options.Nicolas George2012-12-052-10/+71
| | | | | | | | | | On DVDs, the palette is part of the IFO file and therefore not available when reading from a dumped VOB file.
* | oggdec: prevent codec from changing through ogg_replace_stream()Michael Niedermayer2012-12-051-0/+3
| | | | | | | | | | | | | | This prevents inconsistencies leading to out of array accesses. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ff_emulated_edge_mc: fix handling of w/h being 0Michael Niedermayer2012-12-052-0/+6
| | | | | | | | | | | | | | Fixes assertion failure Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | pixdesc: fix broken yuva definitionsPaul B Mahol2012-12-057-50/+50
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | ffv1enc: allow encoding with 1 slice for CIF and smaller in version 3Michael Niedermayer2012-12-051-1/+2
| | | | | | | | | | | | | | | | the default is still 4 slices for any resolution, this just allows the user to force 1 slice. This in my quick test improves compression by 1% for a 320x240 sample Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Set some audio stream properties in the vivo demuxer.Carl Eugen Hoyos2012-12-051-0/+2
| | | | | | | | | | | | This allows playback with MPlayer and the binary decoder. Reviewed-by: Paul B Mahol
* | fate: add gradfun filter test.Clément Bœsch2012-12-052-0/+25
| |
* | fate: add hqdn3d filter test.Clément Bœsch2012-12-052-0/+78
| |
* | lavfi/subtitles: 10l close codec before format.Clément Bœsch2012-12-041-2/+2
| | | | | | | | Fix invalid memory accesses.
* | lavf: compute probe buffer size more reliably.Nicolas George2012-12-041-3/+2
| | | | | | | | | | | | | | | | The previous code computes the offset by reversing the growth of the allocated buffer size: it is complex and did lead to inconsistencies when the size limit is reached. Fix trac ticket #1991.
* | lavfi/drawtext: add the reload option.Nicolas George2012-12-042-14/+37
| |
* | lavf: the core rfps code needs 2 durations to estimate rfpsMichael Niedermayer2012-12-041-1/+1
| | | | | | | | | | | | | | This fixes a regression where this count became 1 with HPM-GC\ EXPORT\ FCP-1A-AVCI100-1080i25-001.mxf Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | av_register_protocol is gone :(Paul B Mahol2012-12-041-1/+0
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | rawvideodec: set bit ratePaul B Mahol2012-12-041-0/+2
| | | | | | | | | | | | Fixes #1989. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | ffmpeg: small indent fix.Clément Bœsch2012-12-041-1/+1
| |
* | ffmpeg: use the correct variables in do_video_stats()Michael Niedermayer2012-12-041-4/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Update video stats log during encode flushThierry Foucu2012-12-041-0/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | gifdec: do not handle timestampsPaul B Mahol2012-12-042-10/+1
| | | | | | | | | | | | | | | | It is broken, and results will be messed up when seeking. This also fix duration displayed for streams when using -c copy. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Add debug output when skipping unknown swf tags.Carl Eugen Hoyos2012-12-041-0/+2
| | | | | | | | Reviewed-by: Clément Bœsch
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-12-044-206/+207
|\| | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ppc: always use pic for shared libraries build: cosmetics: Move CONFIG_RTPDEC entry to a more suitable place fate: ea, h264: prettyprinting and ordering cosmetics Conflicts: tests/fate/ea.mak tests/fate/h264.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ppc: always use pic for shared librariesLuca Barbato2012-12-031-0/+1
| | | | | | | | CC: libav-stable@libav.org
| * build: cosmetics: Move CONFIG_RTPDEC entry to a more suitable placeDiego Biurrun2012-12-031-19/+19
| |
| * fate: ea, h264: prettyprinting and ordering cosmeticsDiego Biurrun2012-12-032-183/+183
| |
* | auenc: remove pointless assigmentPaul B Mahol2012-12-041-2/+0
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | mmf: return meaningful error codesPaul B Mahol2012-12-041-6/+6
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | AST MuxerJames Almer2012-12-0412-18/+280
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | ast: Rename ast.c -> astdec.cJames Almer2012-12-042-1/+1
| | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com>
* | iff demuxer: include DEEP TVDC lookup table in extradata bufferPeter Ross2012-12-042-2/+13
| | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org>
* | iff decoder: DEEP TVDC 32-bit decoderPeter Ross2012-12-042-4/+68
| | | | | | | | Signed-off-by: Peter Ross <pross@xvid.org>
* | configure: Fix ARM thumb detectionMichael Niedermayer2012-12-041-1/+4
| | | | | | | | | | | | | | | | | | | | The detection detects the default but not if it even works. Check building a simple piece of code and disable thumb if it fails This fixes a compile failure If someone has a better idea, just replace this by it! Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | matroskadec: reset size when freeing data.Michael Niedermayer2012-12-041-0/+1
| | | | | | | | | | | | | | Fixes null pointer dereference Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/mp: fix invalid read with filters with no argument.Clément Bœsch2012-12-041-1/+3
| |