summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
* | Merge commit '1bd442c276e6688b43777a198cad0d7e3a92123f'Michael Niedermayer2012-10-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1bd442c276e6688b43777a198cad0d7e3a92123f': nut: prioritize native tags Conflicts: tests/ref/lavfi/crop tests/ref/lavfi/crop_scale tests/ref/lavfi/crop_scale_vflip tests/ref/lavfi/crop_vflip tests/ref/lavfi/null tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_crop tests/ref/lavfi/pixfmts_hflip tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_pad tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip tests/ref/lavfi/scale200 tests/ref/lavfi/scale500 tests/ref/lavfi/vflip tests/ref/lavfi/vflip_crop tests/ref/lavfi/vflip_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * nut: prioritize native tagsLuca Barbato2012-10-13
| | | | | | | | | | Use native tags instead of avi ones, simplifies a lot raw video codecs handling.
* | doc/nut: Clarify what/where is the official nut specificationMichael Niedermayer2012-10-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wv: do not report invalid stream durationPaul B Mahol2012-10-14
| | | | | | | | | | | | | | | | If total number of samples is -1 it means stream is of unknown length. Fixes ticket #1777. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | svq1dec: use log level that have more common sensePaul B Mahol2012-10-14
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | svq1dec: use more common way to check if result is not zeroPaul B Mahol2012-10-14
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | svq1dec: check return value of get_bits1() in more common wayPaul B Mahol2012-10-14
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | svq1dec: return more meaningful error codesPaul B Mahol2012-10-14
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | mp3enc: fix signed C99 overflowMichael Niedermayer2012-10-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dpxenc: fix signed c99 overflowsMichael Niedermayer2012-10-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sws: get rid of C99 signed overflows try #2Michael Niedermayer2012-10-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | paf: avoid C99 overflowsMichael Niedermayer2012-10-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sws: avoid signed C99 overflowsMichael Niedermayer2012-10-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | swr/rematrix: fix C99 left shift overflowMichael Niedermayer2012-10-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | g723_1: fix overflow in square_root()Michael Niedermayer2012-10-14
| | | | | | | | | | | | the intermediate does not fit in a signed 32bit int Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avoid more "0xFF << 24" as it is considered a integer overflow in C99Michael Niedermayer2012-10-14
| | | | | | | | | | | | missed these in my previous search and replace Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avoid "0xFF << 24" as it is considered a integer overflow in C99Michael Niedermayer2012-10-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpeg4videodec: Recalculate timebase in case of guessing time increment bitsMichael Niedermayer2012-10-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavfi/select/scene: use pointer increments instead of y*linesize.Clément Bœsch2012-10-14
| |
* | lavfi/select/scene: fix potential overread.Clément Bœsch2012-10-14
| | | | | | | | | | Also make sure we use the actual width of the image and not the whole linesize.
* | lavfi/select/scene: move out convoluted sad variable init from loop.Clément Bœsch2012-10-14
| |
* | alsdec: fix clipping of weightings for MCC decodingThilo Borgmann2012-10-14
| | | | | | | | | | Fixes CID717905 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegvideo: fix motion_val checksMichael Niedermayer2012-10-14
| | | | | | | | | | Fixes CID604124 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mpegvideo: check return value of ff_MPV_common_init()Michael Niedermayer2012-10-14
| | | | | | | | | | Fixes CID703621 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec_find_best_pix_fmt_of_2: fix handling or PIX_FMT_NONEMichael Niedermayer2012-10-14
| | | | | | | | | | Fixes CID733775 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | flashsv: check deflateInit() return valueMichael Niedermayer2012-10-13
| | | | | | | | | | Fixes CID703620 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dnxhdenc: assert ff_dnxhd_get_cid_table() return valueMichael Niedermayer2012-10-13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dnxhddata_ Fix mixup of sizeof() and array elements in ff_dnxhd_find_cid()Michael Niedermayer2012-10-13
| | | | | | | | | | Fixes CID717910 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffv1: make sure gob_count is not 0Michael Niedermayer2012-10-13
| | | | | | | | | | | | | | Fixes division by 0 Fixes CID733736 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sws-test: raise limigts a bit.Michael Niedermayer2012-10-13
| | | | | | | | | | | | these cases arent used but theres no point in failing on them Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | pp: avoid overflow in w*hMichael Niedermayer2012-10-13
| | | | | | | | | | Fixes CID700580 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sws-test: check W/HMichael Niedermayer2012-10-13
| | | | | | | | | | Fixes CID733834 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/codec_desc: add/update properties of some codecsPaul B Mahol2012-10-13
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | ffeval: avoid folding EOF onto a valid charMichael Niedermayer2012-10-13
| | | | | | | | | | Fixes CID733704 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | probetest: check command line argumentsMichael Niedermayer2012-10-13
| | | | | | | | | | Fixes CID733835 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | trasher: check seek return value.Michael Niedermayer2012-10-13
| | | | | | | | | | Fixes CID733726 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | xbmdec: s/av_reverse/ff_reversePaul B Mahol2012-10-13
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | libavutil: loose idiotic circular dependancies between version and avutil.hMichael Niedermayer2012-10-13
| | | | | | | | | | | | This fixes the recently appearing PIX_FMT warnings Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | sdp: output speex optional vbr parameterDmitry Samonenko2012-10-13
| | | | | | | | | | | | | | Optional sdp speex payload parameter is outputed only when data is encoded. It's not printed in case of stream copy. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | tests: fix checksums for png aspect ratio changeMichael Niedermayer2012-10-13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc: return s->get_buffer() error code if it errors outPaul B Mahol2012-10-13
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | pngenc: write sample aspect ratioPaul B Mahol2012-10-13
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | pngdec: read sample aspect ratioPaul B Mahol2012-10-13
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-13
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vc1: Use codec ID from AVCodecContext while parsing frame header avplay: support mid-stream sample rate changes Conflicts: ffplay.c libavcodec/vc1.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * vc1: Use codec ID from AVCodecContext while parsing frame headerMashiat Sarker Shakkhar2012-10-13
| | | | | | | | | | | | | | This fixes a segfault with samples that I have (both of them MPEG-TS). Looks like avctx->codec is not being set during parsing. Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
| * avplay: support mid-stream sample rate changesJustin Ruggles2012-10-13
| | | | | | | | Resample to the rate that was configured in SDL.
* | ffplay: use audio parameters from the decoded frame instead of AVCodecContextMichael Niedermayer2012-10-13
| | | | | | | | | | Based on commit by Justin Ruggles (the changed code is too different to apply as is) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f5962229bfcb14c2879e69ccdf7f1a4934168609'Michael Niedermayer2012-10-13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f5962229bfcb14c2879e69ccdf7f1a4934168609': avplay: use audio parameters from the decoded frame instead of AVCodecContext dca: allocate a secondary buffer for extra channels when downmixing configure: use utilities from /usr/xpg4/bin if it exists avstring-test: fix memory leaks Conflicts: ffplay.c libavcodec/dcadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avplay: use audio parameters from the decoded frame instead of AVCodecContextJustin Ruggles2012-10-13
| |
| * dca: allocate a secondary buffer for extra channels when downmixingJustin Ruggles2012-10-13
| | | | | | | | | | The output AVFrame buffer only has data for the downmix channels. Fixes a segfault when decoding dca with request_channels == 2.