summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge commit '6baeadd11083774ebd823dd5e1a744c2150a3bfc'Michael Niedermayer2014-08-15
|\ | | | | | | | | | | | | | | | | | | * commit '6baeadd11083774ebd823dd5e1a744c2150a3bfc': w32pthreads: Mark functions in compatibility wrapper as av_unused Conflicts: compat/w32pthreads.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * w32pthreads: Mark functions in compatibility wrapper as av_unusedDiego Biurrun2014-08-15
| | | | | | | | | | | | This avoids annoying warnings about unused functions. The compatibility wrapper is designed to provide a complete (stub) API, so some functions being unused by some files is natural and no reason for a warning.
* | Merge commit '7ccb847f0f1f28199fa254847b91b6e50fb92832'Michael Niedermayer2014-08-15
|\| | | | | | | | | | | | | * commit '7ccb847f0f1f28199fa254847b91b6e50fb92832': http: Reduce scope of a variable in parse_content_encoding() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * http: Reduce scope of a variable in parse_content_encoding()Diego Biurrun2014-08-15
| | | | | | | | Also fixes an unused variable warning with zlib disabled.
* | ffmpeg: remove 32 channel limit from audio_channels_mapMichael Niedermayer2014-08-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix streamcopy with side dataChristophe Gisquet2014-08-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue is that, when the main packet data buffer is changed, streamcopy uses a temporary new packet to store that buffer, frees the old packet, and replace it with the new packet. However, in doing so, it forgets about the side data, which gets freed, but is still needed and referenced. Then, when the packet gets freed again in the normal code path, it attempts to free its side data which has already been freed. Therefore, simply avoid the first free on side data by removing that side data from the packet. Fixes ticket #3773. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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.
* | avutil/opt: remove disabled old ABI compatibility codeMichael Niedermayer2014-08-14
| | | | | | | | | | | | Fixes some unused variable warnings Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/format: remove unused variableMichael Niedermayer2014-08-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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>
* | Merge remote-tracking branch 'cigaes/master'Michael Niedermayer2014-08-14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cigaes/master: lavfi/avf_showspectrum: check RDFT context init. lavfi/avf_showspectrum: add full frame sliding mode. lavfi/avf_showspectrum: use automatic framing. lavfi/avf_showspectrum: do not push the frame at EOF. lavfi/avf_showspectrum: fix output pts computation. lavfi/avf_showspectrum: set output frame rate. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | lavfi/avf_showspectrum: check RDFT context init.Nicolas George2014-08-14
| | | | | | | | | | | | Fix a segfault with large window size.
| * | lavfi/avf_showspectrum: add full frame sliding mode.Nicolas George2014-08-14
| | |
| * | lavfi/avf_showspectrum: use automatic framing.Nicolas George2014-08-14
| | | | | | | | | | | | | | | The framework can ensure that each input frame has exactly the correct number of samples, except the last one.
| * | lavfi/avf_showspectrum: do not push the frame at EOF.Nicolas George2014-08-14
| | | | | | | | | | | | | | | | | | | | | | | | It is always identical to the last pushed frame. The samples in the last incomplete window were ignored, this is unchanged. Possible enhancement: pad the last incomplete window with silence.
| * | lavfi/avf_showspectrum: fix output pts computation.Nicolas George2014-08-14
| | |
| * | lavfi/avf_showspectrum: set output frame rate.Nicolas George2014-08-14
| | |
* | | avfilter/select: larger pixel sad computationClément Bœsch2014-08-14
| | |
* | | avfilter/select: re-align a few commentsClément Bœsch2014-08-14
| | |
* | | 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>
* | Merge commit '0528226a05cc08b74197547fba0b1939bf68990d'Michael Niedermayer2014-08-14
|\| | | | | | | | | | | | | * commit '0528226a05cc08b74197547fba0b1939bf68990d': a64: Return correct error code on invalid data stream Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * a64: Return correct error code on invalid data streamNidhi Makhijani2014-08-14
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit 'e070d0a5ca9047192e324a3f87006b316e2a08a7'Michael Niedermayer2014-08-14
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'e070d0a5ca9047192e324a3f87006b316e2a08a7': frame: Remove some FF_API_AVFRAME_COLORSPACE leftovers Conflicts: libavutil/frame.c No change, as these leftovers have already been removed Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * frame: Remove some FF_API_AVFRAME_COLORSPACE leftoversDiego Biurrun2014-08-14
| |
* | Merge commit 'ab059f0aa896e01e8e4529f5f714fde111f05377'Michael Niedermayer2014-08-14
|\| | | | | | | | | | | | | | | * commit 'ab059f0aa896e01e8e4529f5f714fde111f05377': vaapi: set the scaling list correctly. See: 3fec40b601827e75aae9f0baa47671af15de181a Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * 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>
* | lavf/oggparsevp8: use ff_vorbis_stream_comment()James Almer2014-08-14
| | | | | | | | | | | | | | commit db68ef89 did not update the vp8 parser Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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>
* | lavf: eliminate ff_get_audio_frame_size()Anton Khirnov2014-08-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is basically a wrapper around av_get_audio_frame_duration(), with a fallback to AVCodecContext.frame_size. However, that field is set only when the stream codec context is actually used for encoding or decoding, which is discouraged. For muxing, it is generally the responsibility of the caller to set the packet duration. For demuxing, if the duration is not stored at the container level, it should be set by the parser. Therefore, removing the frame_size fallback should not break any important case. (cherry picked from commit 30e50c50274f88f0f5ae829f401cd3c7f5266719) Conflicts: libavformat/utils.c 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>
* | avformat/utils: Remove demuxer specific frame_size fallback from ↵Michael Niedermayer2014-08-14
| | | | | | | | | | | | ff_get_audio_frame_size() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'e8049af1325dd59a51546c15b2e71a0f578e9d27'Michael Niedermayer2014-08-14
|\| | | | | | | | | | | | | | | | | | | | | * commit 'e8049af1325dd59a51546c15b2e71a0f578e9d27': mpegts: Do not try to write a PMT larger than SECTION_SIZE Conflicts: libavformat/mpegtsenc.c See: 842b6c14bcfc1c5da1a2d288fd65386eb8c158ad Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegts: Do not try to write a PMT larger than SECTION_SIZELuca Barbato2014-08-13
| | | | | | | | | | | | | | | | | | | | | | Prevent out of array writes. Similar to what Michael Niedermayer did to address the same issue. Bug-Id: CVE-2014-2263 CC: libav-stable@libav.org Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '353240541d4ec317471b5cbcaa3e027d00ff8f5c'Michael Niedermayer2014-08-14
|\| | | | | | | | | | | | | | | | | * commit '353240541d4ec317471b5cbcaa3e027d00ff8f5c': cpu-test: Add unistd.h #include for getopt() No change as we already have a #include <unistd.h> Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cpu-test: Add unistd.h #include for getopt()Diego Biurrun2014-08-13
| |
* | Merge commit '30e50c50274f88f0f5ae829f401cd3c7f5266719'Michael Niedermayer2014-08-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '30e50c50274f88f0f5ae829f401cd3c7f5266719': lavf: eliminate ff_get_audio_frame_size() Conflicts: libavformat/utils.c Not merged as the removed code is needed for some bugfixes and would break the fate tests Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-21 20:11:21 +0000