aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ffmpeg: fix accurate seeking with -copytsRodger Combs2014-11-242-2/+17
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avdevice/xcbgrab: fix undefined reference to xcb_shape_rectangles in xcbgrab.cBoris Reisig2014-11-242-3/+14
| | | | | | works with (--enable-libxcb-shape) and without (--disable-libxcb-shape) now. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avformat/mpegenc: assert that premux_packet is non nullMichael Niedermayer2014-11-241-1/+3
| | | | | Based on: 065923b0781b06a2604f69f4e2c2407b7750a854 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'fe42f94ce1023f9c2f7e86404c60afcee5b078a9'Michael Niedermayer2014-11-241-6/+19
|\ | | | | | | | | | | | | * commit 'fe42f94ce1023f9c2f7e86404c60afcee5b078a9': dashenc: Don't segment all video streams when one stream gets a keyframe Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dashenc: Don't segment all video streams when one stream gets a keyframeMartin Storsjö2014-11-241-6/+19
| | | | | | | | | | | | | | | | | | This makes sure that segments actually start at a keyframe (and makes sure we don't split segments twice in a row, with one segment consisting of only a handful of packets), when one stream uses b-frames while another one doesn't. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '6f26f14f134e753d6168591f30815b1c08c1498b'Michael Niedermayer2014-11-241-2/+3
|\| | | | | | | | | | | | | * commit '6f26f14f134e753d6168591f30815b1c08c1498b': sidxindex: Write mimeType=audio/mp4 for audio-only representations Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sidxindex: Write mimeType=audio/mp4 for audio-only representationsMartin Storsjö2014-11-241-2/+3
| | | | | | | | | | | | | | This fixes playback with dash.js, when the input is one separate mp4 file per track. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '208f3abb917757743313da0da714e525e03159d2'Michael Niedermayer2014-11-241-1/+1
|\| | | | | | | | | | | | | | | * commit '208f3abb917757743313da0da714e525e03159d2': aacsbr: always initialize max_qmf_subbands See: c6d3b3be1555257ff3f88da6b8dca2158dad2a85 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacsbr: always initialize max_qmf_subbandsVittorio Giovara2014-11-241-1/+1
| | | | | | | | Fixes a wordly warning from clang -Wsometimes-uninitialized.
* | Merge commit '55b59fab880a9fcdd30f97c5170af282087ac4f7'Michael Niedermayer2014-11-241-2/+1
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '55b59fab880a9fcdd30f97c5170af282087ac4f7': roqaudio: Always use the frame buffer on flush Conflicts: libavcodec/roqaudioenc.c See: a1af505d6640a89401f8e9941a38352a1ca49d58 See: c0b17ea106b94f79255f81ec36ea50096e1ae985 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * roqaudio: Always use the frame buffer on flushMichael Niedermayer2014-11-241-2/+3
| | | | | | | | | | | | | | | | Prevent NULL dereference. CC: libav-stable@libav.org Bug-Id: CID 703669 Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '0562887a984388fdc7a9b71c9374ff9c756fb4f1'Michael Niedermayer2014-11-241-1/+1
|\| | | | | | | | | | | | | | | | | | | * commit '0562887a984388fdc7a9b71c9374ff9c756fb4f1': tiffenc: initialize return value Conflicts: libavcodec/tiffenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * tiffenc: initialize return valueVittorio Giovara2014-11-241-1/+1
| | | | | | | | | | | | | | | | | | 'ret' can only be used without initialization if s->height <= 0, which can only happen if avctx->height <= 0, which is validated elsewhere. Doesn't hurt to still initialize it though. CC: libav-stable@libav.org Bug-Id: CID 732296
* | Merge commit '299d8ab104fb350254eb2e6d9ecdce892a2a55b1'Michael Niedermayer2014-11-241-1/+1
|\| | | | | | | | | | | | | | | * commit '299d8ab104fb350254eb2e6d9ecdce892a2a55b1': cook: Make sure there is enough extradata See: c9e455432988acd414990ba92f782b8e3c4b6aea Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cook: Make sure there is enough extradataLuca Barbato2014-11-241-1/+1
| | | | | | | | | | | | | | At least 8 bytes are needed (Mono audio). Bug-Id: CID 741418 CC: libav-stable@libav.org
* | Merge commit '30b8eb0f87b0eaefdc115ef38f8ad87dd3a6e50b'Michael Niedermayer2014-11-241-11/+8
|\| | | | | | | | | | | | | * commit '30b8eb0f87b0eaefdc115ef38f8ad87dd3a6e50b': sol: simplify sol_codec_id() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * sol: simplify sol_codec_id()Vittorio Giovara2014-11-241-11/+8
| | | | | | | | Bug-Id: CID 1238993
* | Merge commit 'b99ca863506f0630514921b740b78364de67a3ff'Michael Niedermayer2014-11-240-0/+0
|\| | | | | | | | | | | | | | | | | | | | | * commit 'b99ca863506f0630514921b740b78364de67a3ff': aacdec: avoid an out-of-bounds write Conflicts: libavcodec/aacdec.c See: ba02069a8e22985a9a775dac9ece6dc54a7e8b44 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * aacdec: avoid an out-of-bounds writeVittorio Giovara2014-11-241-2/+2
| | | | | | | | | | | | | | Also move the check in the case it is actually used. CC: libav-stable@libav.org Bug-Id: CID 1087090
* | Merge commit '277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2'Michael Niedermayer2014-11-243-3/+2
|\| | | | | | | | | | | | | | | | | | | | | * commit '277ff7f5dc134f1c2dfc4ea0ef3540340482e3d2': lavu: move internal define to the only places where it is used Conflicts: libavcodec/h264_cabac.c libavutil/internal.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavu: move internal define to the only places where it is usedVittorio Giovara2014-11-243-4/+2
| |
* | Merge commit '065923b0781b06a2604f69f4e2c2407b7750a854'Michael Niedermayer2014-11-240-0/+0
|\| | | | | | | | | | | | | | | | | * commit '065923b0781b06a2604f69f4e2c2407b7750a854': mpegenc: prevent a NULL pointer dereference Not merged, this is not needed, and could hide more serious issues Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mpegenc: prevent a NULL pointer dereferenceVittorio Giovara2014-11-241-1/+1
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 29261
* | Merge commit '9c12c6ff9539e926df0b2a2299e915ae71872600'Michael Niedermayer2014-11-249-173/+179
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit '9c12c6ff9539e926df0b2a2299e915ae71872600': motion_est: convert stride to ptrdiff_t Conflicts: libavcodec/me_cmp.c libavcodec/ppc/me_cmp.c libavcodec/x86/me_cmp_init.c See: 9c669672c7fd45ef1cad782ab551be438ceac6cd Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * motion_est: convert stride to ptrdiff_tVittorio Giovara2014-11-245-155/+162
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 700556 / CID 700557 / CID 700558
* | avutil/file: fix av_tempfile() documentationMichael Niedermayer2014-11-241-1/+2
| | | | | | | | | | Found-by: Lukasz Marek <lukasz.m.luki2@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/huffyuvdec: fix mem leak in case of init failureLukasz Marek2014-11-241-21/+28
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | lavc/smvjpegdec: fix mem leak in case of init failureLukasz Marek2014-11-241-15/+19
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | lavc/libxvid: fix mem leak in case of init failureLukasz Marek2014-11-241-4/+7
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | avutil: remove FF_CONST_AVUTIL53, its no longer neededMichael Niedermayer2014-11-245-16/+8
| | | | | | | | | | | | version is 54 already Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Changelog: remove 24bit lossless wma entry for now, some samples work others ↵Michael Niedermayer2014-11-241-1/+0
| | | | | | | | | | | | do not yet work Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/rtmpproto: only prepend @setMetaData for onMetaData and ↵Jeffrey Wescott2014-11-241-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |RtmpSampleAccess In current versions of ffmpeg, when streaming to an RTMP server, anytime a packet of type RTMP_PT_NOTIFY is encountered, the packet is prepended with @setDataFrame before it gets sent to the server. This is incorrect; only packets for onMetaData and |RtmpSampleAccess should invoke @setDataFrame on the RTMP server. Specifically, the current bug manifests itself when trying to stream onTextData or onCuePoint invocations. This fix addresses that problem and ensures that the @setDataFrame is only prepended for onMetaData and |RtmpSampleAccess. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavc/rv30: fix mem leak in case of init failureLukasz Marek2014-11-231-4/+4
| | | | | | | | | | | | Also replaced return -1 with return AVERROR(EINVAL) Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | lavc/mss1: fix mem leak in case of init failureLukasz Marek2014-11-231-0/+2
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | lavf/apngdec: print currently unsupported in-stream tags in a more readable formJames Almer2014-11-231-1/+6
| | | | | | | | | | | | | | Also use length and not stream position Reviewed-by: Benoit Fouet <benoit.fouet@free.fr> Signed-off-by: James Almer <jamrial@gmail.com>
* | Print a warning if vp6 is muxed into flv: The output is flipped.Carl Eugen Hoyos2014-11-231-0/+3
| | | | | | | | Fixes ticket #4132.
* | Fix standalone compilation of the apng decoder on x86.Carl Eugen Hoyos2014-11-231-0/+2
| |
* | avcodec/microdvddec: support non persistent italic marker '/'Clément Bœsch2014-11-231-1/+17
| | | | | | | | | | | | Inspired from a patch by Michal Wazgird <mplayer@cyryl.net> See https://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2014-November/072772.html
* | avcodec/microdvddec: support various broken form of color tagsClément Bœsch2014-11-231-1/+1
| | | | | | | | | | | | Inspired by a patch from Michal Wazgird <mplayer@cyryl.net> See https://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2014-November/072772.html
* | xface: reduce stack usage by directly storing 2 bytes data instead of pointers.Reimar Döffinger2014-11-231-4/+4
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | xface: reduce table sizes.Reimar Döffinger2014-11-231-2/+2
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | xface: Fix encoder crashes due to too small on-stack array.Reimar Döffinger2014-11-237-4/+26
| | | | | | | | | | | | Also add a FATE test. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | svq1enc: reduce stack usage of recursively-called function.Reimar Döffinger2014-11-232-1/+3
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | lpc: Reduce stack usage by allocating LLSModel in context.Reimar Döffinger2014-11-232-1/+5
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | lavc/libvorbisdec: use better error codesLukasz Marek2014-11-231-4/+4
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | lavc/libvorbisdec: fix mem leak in case of init failureLukasz Marek2014-11-231-7/+15
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | lavc/smacker: fix mem leak in case of init failureLukasz Marek2014-11-231-0/+1
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | lavc/anm: fix mem leak in case of init failureLukasz Marek2014-11-231-1/+3
| | | | | | | | Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
* | avcodec/x86/Makefile: fix orderMichael Niedermayer2014-11-231-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f856d9c2f314c493c672dfb9c876da182525da3d'Michael Niedermayer2014-11-231-3/+8
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f856d9c2f314c493c672dfb9c876da182525da3d': dashenc: Don't require the stream bitrate to be known Conflicts: libavformat/dashenc.c See: 5f8fcdd4481b3e740d76b09e10a80e3271ef47b5 Merged-by: Michael Niedermayer <michaelni@gmx.at>