summaryrefslogtreecommitdiff
path: root/libavcodec
Commit message (Collapse)AuthorAge
* Drop remaining unneeded != NULLMichael Niedermayer2014-08-15
| | | | | Reviewed-by: Clément Bœsch <u@pkh.me> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867'Michael Niedermayer2014-08-15
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4b1f5e5090abed6c618c8ba380cd7d28d140f867': cosmetics: Write NULL pointer inequality checks more compactly Conflicts: libavcodec/dvdsubdec.c libavcodec/h263dec.c libavcodec/libxvid.c libavcodec/rv10.c libavcodec/utils.c libavformat/format.c libavformat/matroskadec.c libavformat/segment.c libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Write NULL pointer inequality checks more compactlyGabriel Dume2014-08-15
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f929ab0569ff31ed5a59b0b0adb7ce09df3fca39': cosmetics: Write NULL pointer equality checks more compactly Conflicts: cmdutils.c ffmpeg_opt.c ffplay.c libavcodec/dvbsub.c libavcodec/dvdsubdec.c libavcodec/dvdsubenc.c libavcodec/dxa.c libavcodec/libxvid_rc.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/tiffenc.c libavcodec/utils.c libavcodec/vc1dec.c libavcodec/zmbv.c libavdevice/v4l2.c libavformat/matroskadec.c libavformat/movenc.c libavformat/sdp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Write NULL pointer equality checks more compactlyGabriel Dume2014-08-15
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'efd26bedec9a345a5960dbfcbaec888418f2d4e6'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | | | | | | | | | * commit 'efd26bedec9a345a5960dbfcbaec888418f2d4e6': build: Add explanatory comments to (optimization) blocks in the Makefiles Conflicts: libavcodec/ppc/Makefile libavcodec/x86/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * build: Add explanatory comments to (optimization) blocks in the MakefilesDiego Biurrun2014-08-15
| |
* | Merge commit '835f798c7d20bca89eb4f3593846251ad0d84e4b'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '835f798c7d20bca89eb4f3593846251ad0d84e4b': mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixes Conflicts: libavcodec/h261dec.c libavcodec/intrax8.c libavcodec/mjpegenc.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpeg4videoenc.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h libavcodec/mpegvideo_enc.c libavcodec/rv10.c libavcodec/x86/mpegvideoenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegvideo: cosmetics: Lowercase ugly uppercase MPV_ function name prefixesDiego Biurrun2014-08-15
| |
* | avcodec/h261dec: Fix context initialization sequenceMichael Niedermayer2014-08-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '552bc42df48784ae3ce0d499ece5b33f3cc7576a'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | * commit '552bc42df48784ae3ce0d499ece5b33f3cc7576a': h261dec: Fix order of initialization Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h261dec: Fix order of initializationJohn Stebbins2014-08-14
| | | | | | | | | | ff_MPV_common_init requires the frame dimensions which get parsed in h261_decode_picture_header.
* | Merge commit 'b869eea7ea8f5d8331fcd6355f848bb6a6e06b14'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | * commit 'b869eea7ea8f5d8331fcd6355f848bb6a6e06b14': h263dec: Fix order of initialization Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * h263dec: Fix order of initializationJohn Stebbins2014-08-14
| | | | | | | | | | ff_MPV_common_init requires the frame dimensions which get parsed in *_decode_picture_header.
* | Merge commit '998c9f15d1ca8c7489775ebcca51623b915988f1'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '998c9f15d1ca8c7489775ebcca51623b915988f1': idct: remove call to ff_idctdsp_init from ff_MPV_common_init Conflicts: libavcodec/dnxhdenc.c libavcodec/h263dec.c libavcodec/mpegvideo.c libavcodec/mpegvideo.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * idct: remove call to ff_idctdsp_init from ff_MPV_common_initJohn Stebbins2014-08-14
| | | | | | | | | | One step in untangling the mpegvideo code and fixing some problems in the order that initialization is being done in h263dec and h261dec.
* | lavc/flacdsp: change lpc_encoder function pointer prototypeJames Darnley2014-08-14
| | | | | | | | | | | | | | This should help to clarify the API. Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/mjpegdec: Support AV_PIX_FMT_YUV420P16 with upscale_hMichael Niedermayer2014-08-14
| | | | | | | | | | | | | | Fixes assertion failure Fixes: test42f.jpg Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavcodec: bump micro to reflect dpx changesChristophe Gisquet2014-08-14
| | | | | | | | | | | | | | | | The encoder produces files that are no longer compatible with previous versions of the decoder, and may actually cause decoding issues for other software, so indicate that change to allow decoder quirks. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/lcldec: initialize encoded correctlyMichael Niedermayer2014-08-14
| | | | | | | | | | | | | | | | Fixes out of array read Fixes: yuv111_no_compr_crash.avi Found-by: Piotr Bandurski <ami_stuff@o2.pl> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | proresenc_kostya: properly account for alphaChristophe Gisquet2014-08-14
| | | | | | | | | | | | | | The packet buffer allocation considered as dct-coded, while it is actually run-coded and thus requires a larger buffer. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dpx: use aligned line startsChristophe Gisquet2014-08-14
| | | | | | | | | | | | | | | | | | | | SMPTE 268M-2003 specifies that each line starts at a 4-bytes boundary. Therefore, modify correspondingly the input buffer strides and size. Partially fixes ticket #3692: DLAD_8b_3c_big.dpx still has inverted colors, which might be related to endianness. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '93f29948e4b06acfb96e7f82d373ef86d6dc55f7'Michael Niedermayer2014-08-14
|\| | | | | | | | | | | | | | | | | | | * commit '93f29948e4b06acfb96e7f82d373ef86d6dc55f7': mpeg4video: Fix doxygen comment syntax to document correct struct member Conflicts: libavcodec/mpeg4video.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpeg4video: Fix doxygen comment syntax to document correct struct memberNidhi Makhijani2014-08-14
| | | | | | | | | | | | Also fix some comment typos. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * vaapi: set the scaling list correctly.Edgar Hucek2014-08-14
| | | | | | | | | | | | | | | | Fixes VAAPI decoding artefacts. CC:libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | dpx: warn if encryptedChristophe Gisquet2014-08-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dpxenc: enforce alignment requirementChristophe Gisquet2014-08-14
| | | | | | | | | | | | | | S268M-2003 specifies that each line start is aligned on a 4-byte boundary. Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Move WMA case from ff_get_audio_frame_size() to av_get_audio_frame_duration()Michael Niedermayer2014-08-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Move frame_size fallback from ff_get_audio_frame_size() to ↵Michael Niedermayer2014-08-14
| | | | | | | | | | | | av_get_audio_frame_duration() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vp9: ignore reference segmentation map if error_resilience flag is set.Ronald S. Bultje2014-08-13
| | | | | | | | | | | | Fixes ffvp9_fails_where_libvpx.succeeds.webm from ticket 3849. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/dnxhd: ff_dnxhd_cid_table is not exportedJames Almer2014-08-13
| | | | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cvcodec/flacdsp_lpc_template: osmetic fixJames Darnley2014-08-13
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/flacenc: partially unroll loop in flac_enc_lpc_16James Darnley2014-08-13
| | | | | | | | | | | | | | | | | | | | | | | | It now does 12 samples per iteration, up from 4. From 1.8 to 3.2 times faster again. 3.6 to 5.7 times faster overall. Runtime is reduced by a further 2 to 18%. Overall runtime reduced by 4 to 50%. Same conditions as before apply. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/idctdsp: make add/put_pixels_clamped_c internal functionsJames Almer2014-08-13
| | | | | | | | | | | | | | This reduces code duplication and differences with the fork. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/flacenc: add sse4 version of the 16-bit lpc encoderJames Darnley2014-08-13
| | | | | | | | | | | | | | | | | | | | From 1.8 to 2.4 times faster. Runtime is reduced by 2 to 39%. The speed-up generally increases with compression_level. This lpc encoder is not used with levels < 3 so it provides no speed-up in these cases. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec: add C xvid IDCT supportPascal Massimino2014-08-12
| | | | | | | | | | | | | | | | | | Thanks to Pascal Massimino and Michael Militzer for permission to use under LGPL The xvid idct code is from xvid, and nearly unchanged to make future syncing easy the integration into ffmpeg is done by the commiter the commit message is written by the commiter Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'da7d839a0d3ec40423a665dc85e0cfaed3f92eb8'Michael Niedermayer2014-08-12
|\| | | | | | | | | | | | | | | | | | | | | * commit 'da7d839a0d3ec40423a665dc85e0cfaed3f92eb8': ffv1dec: check that global parameters do not change in version 0/1 Conflicts: libavcodec/ffv1dec.c See: b05cd1ea7e45a836f7f6071a716c38bb30326e0f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffv1dec: check that global parameters do not change in version 0/1Michael Niedermayer2014-08-12
| | | | | | | | | | | | | | | | | | Such changes are neither allowed nor supported Found-by: ami_stuff Bug-Id: CVE-2013-7020 CC: libav-stable@libav.org Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * hevc_mvs: avoid deriving tmvp in amvpChristophe Gisquet2014-08-12
| | | | | | | | | | | | | | | | Reduces the number of calls to tmvp derivation from 933685 to 586271 on a sequence. Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr> Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * hevc: wait proper position for tmvpChristophe Gisquet2014-08-12
| | | | | | | | | | | | | | | | | | The position is either rounded or not checked, so delay the wait to check the proper value. Reviewed-by: Mickaël Raulet <mraulet@insa-rennes.fr> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'cf6090dc6252f2b276aa4133e3d73a89f4c6046c'Michael Niedermayer2014-08-12
|\| | | | | | | | | | | | | | | | | | | | | * commit 'cf6090dc6252f2b276aa4133e3d73a89f4c6046c': hevc: use intreadwrite Conflicts: libavcodec/hevc_mvs.c See: 7a4a5515b0ce97f1c4e18ed012cc3f86328dd220 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: use intreadwriteChristophe Gisquet2014-08-12
| | | | | | | | | | | | When dealing with MVs, both components may be processed at a time. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'ed53cc217f6a6e4ddb35e3f01a79496091dc82dc'Michael Niedermayer2014-08-12
|\| | | | | | | | | | | | | | | | | | | | | * commit 'ed53cc217f6a6e4ddb35e3f01a79496091dc82dc': hevc: derive partial merge list Conflicts: libavcodec/hevc_mvs.c See: 4576eff05d94a5e0b853a7a595d31351cc539e7b Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: derive partial merge listChristophe Gisquet2014-08-12
| | | | | | | | | | | | The merge list only needs to be derived up to the merge index. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * hevc: derive partially amvp listChristophe Gisquet2014-08-12
| | | | | | | | | | | | When the candidate has been found, no need to derive others. Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit '09182b3224370e1d636631e77f201a8388766bd6'Michael Niedermayer2014-08-12
|\| | | | | | | | | | | | | | | | | | | | | * commit '09182b3224370e1d636631e77f201a8388766bd6': hevc: simplify rounding Conflicts: libavcodec/hevc_mvs.c See: 2e471e4703ed5aaab6d6b6bf5a3c6895b79f02b4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: simplify roundingChristophe Gisquet2014-08-12
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | Merge commit 'd1b1c3bb5ef1bee409c06c3bcacfb8674e1cb574'Michael Niedermayer2014-08-12
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd1b1c3bb5ef1bee409c06c3bcacfb8674e1cb574': hevc: reorder loops Conflicts: libavcodec/hevc.c See: eca1957c4cbee66a0b1f3dcabaffe68d61885f16 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * hevc: reorder loopsChristophe Gisquet2014-08-12
| | | | | | | | | | | | iterate over memory in a more continuous order Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | vp9/x86: fix bug in intra_pred_hd_32x32.Ronald S. Bultje2014-08-12
| | | | | | | | | | | | | | | | Fixes mismatch in first keyframe in sample ffvp9_fails_where_libvpx.succeeds.webm from ticket 3849. There's still a second mismatch a few frames into the sample. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>