ffmpeg

Author	SHA1	Message	Date
Clément Bœsch	c20a7ce62d	avcodec/vp9: remove some reset-to-zero from vp9_decode_free(). Those should not be necessary. Original change by one of these developers: Anton Khirnov <anton@khirnov.net> Diego Biurrun <diego@biurrun.de> Luca Barbato <lu_zero@gentoo.org> Martin Storsjö <martin@martin.st> See `97962b2` / `72ca830`	2013-11-16 22:34:23 +01:00
Clément Bœsch	7e704b1e10	avcodec/vp9: add a never triggerable assert. vp8_rac_get_tree() is called with a tree of size 3, so the returned value can not be outside [0;3]. All of the [0;3] cases are handled in the switch, so the assert should not be triggerable by any means. A similar change was introduced in `97962b2` / `72ca830`, with the av_log()+AVERROR_INVALIDDATA form, suggesting it could be triggerable somehow. This assert might help static analyzer, or simply the reader.	2013-11-16 22:34:23 +01:00
Michael Niedermayer	cee63a1483	Merge remote-tracking branch 'cus/stable' * cus/stable: ffplay: calculate last frame duration from vp->pts instead of frame_last_pts ffplay: simplify early frame drop code Merged-by: Michael Niedermayer <michaelni@gmx.at>	2013-11-16 21:47:53 +01:00
Michael Niedermayer	6909a611d2	swscale/swscale_unscaled: fix right column handling in planarCopyWrapper Found-by: Михаил <Micky53@mail.ru> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2013-11-16 21:15:05 +01:00
Martin Storsjö	ab80d7e8c5	vp9: Ensure that the arithmetic coder values are read in the right order The operands of an addition can be evaluated in any order, since the addition isn't a sequence point. The only operators that have a defined evaluation order are &&, \|\|, ?: and the sequence operator ','. This fixes fate-vp9 on ARM RVCT.	2013-11-16 20:25:25 +01:00
Clément Bœsch	7cd555dfa5	avcodec/vp9: make last_invisible local. Original change by one of these developers: Anton Khirnov <anton@khirnov.net> Diego Biurrun <diego@biurrun.de> Luca Barbato <lu_zero@gentoo.org> Martin Storsjö <martin@martin.st> See `97962b2` / `72ca830`	2013-11-16 17:13:33 +01:00
Clément Bœsch	d28c79b003	avcodec/x86/vp9dsp: use EXTERNAL_* macros. Original fix by one of these developers: Anton Khirnov <anton@khirnov.net> Diego Biurrun <diego@biurrun.de> Luca Barbato <lu_zero@gentoo.org> Martin Storsjö <martin@martin.st> See `97962b2` / `72ca830` Personnal guess is Diego Biurrun.	2013-11-16 17:03:17 +01:00
Marton Balint	2803140457	ffplay: calculate last frame duration from vp->pts instead of frame_last_pts Also do not update current pts on dropped frames, it is no longer necessary. Fixes regression part of ticket #2507. Signed-off-by: Marton Balint <cus@passwd.hu>	2013-11-16 14:55:08 +01:00
Marton Balint	02b76aa377	ffplay: simplify early frame drop code Also never early frame drop the first frame after a flush. Signed-off-by: Marton Balint <cus@passwd.hu>	2013-11-16 14:55:08 +01:00
Michael Niedermayer	d7ebeba80c	ffmpeg: Do not fill gap before the first decodable frame on single stream input files unless the user explicitly requests it. Fixes different behavior to JM and probably several if not all reference decoders. We cannot just do this unconditionally as it would ruin AV sync in some use cases. Bug-Found-by: BugMaster Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2013-11-16 14:27:29 +01:00
Byte	d04b7de786	avformat/rtmphttp: Partial fix for the ticket #3127 (second try) Reviewed-by: Lukasz M <lukasz.m.luki@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2013-11-16 02:45:58 +01:00
wangxingchao	68900bf16b	avcodec: Fix duration error after seek operation After seek, s->duration need recalculation, AVCodecParserContext need be set again. Without the fix, the first audio packet would be dropped after compute_pkt_fields() as the final pts/dts become invalid. Signed-off-by: wangxingchao <wangxingchao@xiaomi.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2013-11-16 02:02:51 +01:00
Jan Gerber	8cc59ec881	lavf/matroskadec ReferenceBlock is a signed integer according to the Matroska Specification ReferenceBlock is a signed integer too. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2013-11-16 01:24:40 +01:00
Jan Gerber	f4b1ca99ff	lavf/matroska*: DiscardPadding is a signed integer according to the Matriska Specification http://matroska.org/technical/specs/index.html DiscardPadding is a signed integer. Tested-by: Jan Gerber <j@v2v.cc> Tested-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2013-11-16 00:49:23 +01:00
Clément Bœsch	150c5543ff	avcodec/vp9: fix "initialize" typo. Originally spotted and fixed by one of these developers: Anton Khirnov <anton@khirnov.net> Diego Biurrun <diego@biurrun.de> Luca Barbato <lu_zero@gentoo.org> Martin Storsjö <martin@martin.st> See `97962b2` / `72ca830`	2013-11-15 23:28:48 +01:00
Michael Niedermayer	cddd15ba5c	avformat/matroska: simplify signed int access code Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2013-11-15 21:38:23 +01:00
Jan Gerber	d03eea36b2	lavf/matroska*: add support for signed integers Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2013-11-15 21:38:12 +01:00
Compn	5592d1b741	riff: add G264 to mpeg4, only decodes keyframes	2013-11-15 09:46:35 -05:00
Michael Niedermayer	97962b278a	Merge remote-tracking branch 'qatar/master' * qatar/master: lavc: VP9 decoder Conflicts: Changelog doc/general.texi libavcodec/Makefile libavcodec/version.h libavcodec/vp9.c libavcodec/vp9.h libavcodec/vp9data.h libavcodec/vp9dsp.c libavcodec/x86/Makefile libavcodec/x86/vp9dsp.asm libavcodec/x86/vp9dsp_init.c tests/fate/vpx.mak tests/ref/fate/vp9-00-quantizer-00 tests/ref/fate/vp9-00-quantizer-01 tests/ref/fate/vp9-00-quantizer-02 tests/ref/fate/vp9-00-quantizer-03 tests/ref/fate/vp9-00-quantizer-04 tests/ref/fate/vp9-00-quantizer-05 tests/ref/fate/vp9-00-quantizer-06 tests/ref/fate/vp9-00-quantizer-07 tests/ref/fate/vp9-00-quantizer-08 tests/ref/fate/vp9-00-quantizer-09 tests/ref/fate/vp9-00-quantizer-10 tests/ref/fate/vp9-00-quantizer-11 tests/ref/fate/vp9-00-quantizer-12 tests/ref/fate/vp9-00-quantizer-13 tests/ref/fate/vp9-00-quantizer-14 tests/ref/fate/vp9-00-quantizer-15 tests/ref/fate/vp9-00-quantizer-16 tests/ref/fate/vp9-00-quantizer-17 tests/ref/fate/vp9-00-quantizer-18 tests/ref/fate/vp9-00-quantizer-19 tests/ref/fate/vp9-00-quantizer-20 tests/ref/fate/vp9-00-quantizer-21 tests/ref/fate/vp9-00-quantizer-22 tests/ref/fate/vp9-00-quantizer-23 tests/ref/fate/vp9-00-quantizer-24 tests/ref/fate/vp9-00-quantizer-25 tests/ref/fate/vp9-00-quantizer-26 tests/ref/fate/vp9-00-quantizer-27 tests/ref/fate/vp9-00-quantizer-28 tests/ref/fate/vp9-00-quantizer-29 tests/ref/fate/vp9-00-quantizer-30 tests/ref/fate/vp9-00-quantizer-31 tests/ref/fate/vp9-00-quantizer-32 tests/ref/fate/vp9-00-quantizer-33 tests/ref/fate/vp9-00-quantizer-34 tests/ref/fate/vp9-00-quantizer-35 tests/ref/fate/vp9-00-quantizer-36 tests/ref/fate/vp9-00-quantizer-37 tests/ref/fate/vp9-00-quantizer-38 tests/ref/fate/vp9-00-quantizer-39 tests/ref/fate/vp9-00-quantizer-40 tests/ref/fate/vp9-00-quantizer-41 tests/ref/fate/vp9-00-quantizer-42 tests/ref/fate/vp9-00-quantizer-43 tests/ref/fate/vp9-00-quantizer-44 tests/ref/fate/vp9-00-quantizer-45 tests/ref/fate/vp9-00-quantizer-46 tests/ref/fate/vp9-00-quantizer-47 tests/ref/fate/vp9-00-quantizer-48 tests/ref/fate/vp9-00-quantizer-49 tests/ref/fate/vp9-00-quantizer-50 tests/ref/fate/vp9-00-quantizer-51 tests/ref/fate/vp9-00-quantizer-52 tests/ref/fate/vp9-00-quantizer-53 tests/ref/fate/vp9-00-quantizer-54 tests/ref/fate/vp9-00-quantizer-55 tests/ref/fate/vp9-00-quantizer-56 tests/ref/fate/vp9-00-quantizer-57 tests/ref/fate/vp9-00-quantizer-58 tests/ref/fate/vp9-00-quantizer-59 tests/ref/fate/vp9-00-quantizer-60 tests/ref/fate/vp9-00-quantizer-61 tests/ref/fate/vp9-00-quantizer-62 tests/ref/fate/vp9-00-quantizer-63 tests/ref/fate/vp9-01-sharpness-1 tests/ref/fate/vp9-01-sharpness-2 tests/ref/fate/vp9-01-sharpness-3 tests/ref/fate/vp9-01-sharpness-4 tests/ref/fate/vp9-01-sharpness-5 tests/ref/fate/vp9-01-sharpness-6 tests/ref/fate/vp9-01-sharpness-7 tests/ref/fate/vp9-02-size-08x08 tests/ref/fate/vp9-02-size-08x10 tests/ref/fate/vp9-02-size-08x16 tests/ref/fate/vp9-02-size-08x18 tests/ref/fate/vp9-02-size-08x32 tests/ref/fate/vp9-02-size-08x34 tests/ref/fate/vp9-02-size-08x64 tests/ref/fate/vp9-02-size-08x66 tests/ref/fate/vp9-02-size-10x08 tests/ref/fate/vp9-02-size-10x10 tests/ref/fate/vp9-02-size-10x16 tests/ref/fate/vp9-02-size-10x18 tests/ref/fate/vp9-02-size-10x32 tests/ref/fate/vp9-02-size-10x34 tests/ref/fate/vp9-02-size-10x64 tests/ref/fate/vp9-02-size-10x66 tests/ref/fate/vp9-02-size-16x08 tests/ref/fate/vp9-02-size-16x10 tests/ref/fate/vp9-02-size-16x16 tests/ref/fate/vp9-02-size-16x18 tests/ref/fate/vp9-02-size-16x32 tests/ref/fate/vp9-02-size-16x34 tests/ref/fate/vp9-02-size-16x64 tests/ref/fate/vp9-02-size-16x66 tests/ref/fate/vp9-02-size-18x08 tests/ref/fate/vp9-02-size-18x10 tests/ref/fate/vp9-02-size-18x16 tests/ref/fate/vp9-02-size-18x18 tests/ref/fate/vp9-02-size-18x32 tests/ref/fate/vp9-02-size-18x34 tests/ref/fate/vp9-02-size-18x64 tests/ref/fate/vp9-02-size-18x66 tests/ref/fate/vp9-02-size-32x08 tests/ref/fate/vp9-02-size-32x10 tests/ref/fate/vp9-02-size-32x16 tests/ref/fate/vp9-02-size-32x18 tests/ref/fate/vp9-02-size-32x32 tests/ref/fate/vp9-02-size-32x34 tests/ref/fate/vp9-02-size-32x64 tests/ref/fate/vp9-02-size-32x66 tests/ref/fate/vp9-02-size-34x08 tests/ref/fate/vp9-02-size-34x10 tests/ref/fate/vp9-02-size-34x16 tests/ref/fate/vp9-02-size-34x18 tests/ref/fate/vp9-02-size-34x32 tests/ref/fate/vp9-02-size-34x34 tests/ref/fate/vp9-02-size-34x64 tests/ref/fate/vp9-02-size-34x66 tests/ref/fate/vp9-02-size-64x08 tests/ref/fate/vp9-02-size-64x10 tests/ref/fate/vp9-02-size-64x16 tests/ref/fate/vp9-02-size-64x18 tests/ref/fate/vp9-02-size-64x32 tests/ref/fate/vp9-02-size-64x34 tests/ref/fate/vp9-02-size-64x64 tests/ref/fate/vp9-02-size-64x66 tests/ref/fate/vp9-02-size-66x08 tests/ref/fate/vp9-02-size-66x10 tests/ref/fate/vp9-02-size-66x16 tests/ref/fate/vp9-02-size-66x18 tests/ref/fate/vp9-02-size-66x32 tests/ref/fate/vp9-02-size-66x34 tests/ref/fate/vp9-02-size-66x64 tests/ref/fate/vp9-02-size-66x66 tests/ref/fate/vp9-03-deltaq tests/ref/fate/vp9-03-size-196x196 tests/ref/fate/vp9-03-size-196x198 tests/ref/fate/vp9-03-size-196x200 tests/ref/fate/vp9-03-size-196x202 tests/ref/fate/vp9-03-size-196x208 tests/ref/fate/vp9-03-size-196x210 tests/ref/fate/vp9-03-size-196x224 tests/ref/fate/vp9-03-size-196x226 tests/ref/fate/vp9-03-size-198x196 tests/ref/fate/vp9-03-size-198x198 tests/ref/fate/vp9-03-size-198x200 tests/ref/fate/vp9-03-size-198x202 tests/ref/fate/vp9-03-size-198x208 tests/ref/fate/vp9-03-size-198x210 tests/ref/fate/vp9-03-size-198x224 tests/ref/fate/vp9-03-size-198x226 tests/ref/fate/vp9-03-size-200x196 tests/ref/fate/vp9-03-size-200x198 tests/ref/fate/vp9-03-size-200x200 tests/ref/fate/vp9-03-size-200x202 tests/ref/fate/vp9-03-size-200x208 tests/ref/fate/vp9-03-size-200x210 tests/ref/fate/vp9-03-size-200x224 tests/ref/fate/vp9-03-size-200x226 tests/ref/fate/vp9-03-size-202x196 tests/ref/fate/vp9-03-size-202x198 tests/ref/fate/vp9-03-size-202x200 tests/ref/fate/vp9-03-size-202x202 tests/ref/fate/vp9-03-size-202x208 tests/ref/fate/vp9-03-size-202x210 tests/ref/fate/vp9-03-size-202x224 tests/ref/fate/vp9-03-size-202x226 tests/ref/fate/vp9-03-size-208x196 tests/ref/fate/vp9-03-size-208x198 tests/ref/fate/vp9-03-size-208x200 tests/ref/fate/vp9-03-size-208x202 tests/ref/fate/vp9-03-size-208x208 tests/ref/fate/vp9-03-size-208x210 tests/ref/fate/vp9-03-size-208x224 tests/ref/fate/vp9-03-size-208x226 tests/ref/fate/vp9-03-size-210x196 tests/ref/fate/vp9-03-size-210x198 tests/ref/fate/vp9-03-size-210x200 tests/ref/fate/vp9-03-size-210x202 tests/ref/fate/vp9-03-size-210x208 tests/ref/fate/vp9-03-size-210x210 tests/ref/fate/vp9-03-size-210x224 tests/ref/fate/vp9-03-size-210x226 tests/ref/fate/vp9-03-size-224x196 tests/ref/fate/vp9-03-size-224x198 tests/ref/fate/vp9-03-size-224x200 tests/ref/fate/vp9-03-size-224x202 tests/ref/fate/vp9-03-size-224x208 tests/ref/fate/vp9-03-size-224x210 tests/ref/fate/vp9-03-size-224x224 tests/ref/fate/vp9-03-size-224x226 tests/ref/fate/vp9-03-size-226x196 tests/ref/fate/vp9-03-size-226x198 tests/ref/fate/vp9-03-size-226x200 tests/ref/fate/vp9-03-size-226x202 tests/ref/fate/vp9-03-size-226x208 tests/ref/fate/vp9-03-size-226x210 tests/ref/fate/vp9-03-size-226x224 tests/ref/fate/vp9-03-size-226x226 tests/ref/fate/vp9-2pass-akiyo tests/ref/fate/vp9-segmentation-akiyo tests/ref/fate/vp9-tiling-pedestrian Not merged at the request of the authors and maintainers "<ubitux> we have a lot of fixes they don't have, as well as optim actually" See: `848826f527` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2013-11-15 15:24:36 +01:00
Michael Niedermayer	91e00c4a78	Merge commit '458446acfa1441d283dacf9e6e545beb083b8bb0' * commit '458446acfa1441d283dacf9e6e545beb083b8bb0': lavc: Edge emulation with dst/src linesize Conflicts: libavcodec/cavs.c libavcodec/h264.c libavcodec/hevc.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/rv34.c libavcodec/svq3.c libavcodec/vc1dec.c libavcodec/videodsp.h libavcodec/videodsp_template.c libavcodec/vp3.c libavcodec/vp8.c libavcodec/wmv2.c libavcodec/x86/videodsp.asm libavcodec/x86/videodsp_init.c Changes to the asm are not merged, they are left for volunteers or in their absence for later. The changes this merge introduces are reordering of the function arguments See: `face578d56` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2013-11-15 15:07:10 +01:00
Michael Niedermayer	e28130bcaf	Merge commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4' * commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4': dv: Split DV data table declarations into their own header Conflicts: libavcodec/dvdata.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2013-11-15 12:52:19 +01:00
Michael Niedermayer	3e78ceadf9	Merge commit 'e8fcdebb17fc59375fd9fc6c0a02a1d2e6d9fb23' * commit 'e8fcdebb17fc59375fd9fc6c0a02a1d2e6d9fb23': build: Allow specifying extra object files when linking HOSTPROGS Merged-by: Michael Niedermayer <michaelni@gmx.at>	2013-11-15 12:19:45 +01:00
Alex Sukhanov	86b3435fc0	af_aresample: Fix timestamp of first padded PCM audio packet Problem: ffmpeg generated video file which had two audio packets with the same timestamp: last original audio packet and first padded audio packet. Timestamp of first added audio packet by 'apad' fitler had the same value as last original audio packet. The problem was in 'aresample' fitler, which used next pts instead of current one. As long as 'apad' and 'aresample' filters have separate mechanisms of timestamp calculation, they got the same values. Command line: ffmpeg -i <input_filename> -shortest -apad 512 -af asetnsamples=n=512 -b:a 1058400 -ac 1 -ar 44100 -async 0 -acodec pcm_s16le -sn -f matroska -y <output_file> Fix: Call swr_next_pts() function before swr_convert() Tested: FATE tests passed. Fix has been tested in our Transcoder regression framework on ~10k test videos. It's about ~500k transcodes. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2013-11-15 11:54:02 +01:00
Ronald S. Bultje	72ca830f51	lavc: VP9 decoder Originally written by Ronald S. Bultje <rsbultje@gmail.com> and Clément Bœsch <u@pkh.me> Further contributions by: Anton Khirnov <anton@khirnov.net> Diego Biurrun <diego@biurrun.de> Luca Barbato <lu_zero@gentoo.org> Martin Storsjö <martin@martin.st> Signed-off-by: Luca Barbato <lu_zero@gentoo.org> Signed-off-by: Anton Khirnov <anton@khirnov.net>	2013-11-15 10:16:28 +01:00
Ronald S. Bultje	458446acfa	lavc: Edge emulation with dst/src linesize Allow supporting files for which the image stride is smaller than the maximum block size + number of subpel mc taps, e.g. a 64x64 VP9 file or a 16x16 VP8 file with -fflags +emu_edge.	2013-11-15 10:16:27 +01:00
Lukasz Marek	995f450b44	lavd/xv: free resources on errors xv_write_header callback leave not freed resources on errors. Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>	2013-11-15 09:56:58 +01:00
Lukasz Marek	57bca5a2b6	lavd/xv: add more supported formats Add support for following pixel formats: - AV_PIX_FMT_UYVY422 - AV_PIX_FMT_YUYV422 Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>	2013-11-15 09:56:58 +01:00
Lukasz Marek	5d8619595b	lavd/xv: simplify write_packet Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com>	2013-11-15 09:56:58 +01:00
Diego Biurrun	3cbe112653	dv: Split DV data table declarations into their own header This is necessary to avoid target config settings bleeding into the host compilation process with hardcoded tables and the DV VLC tables no longer present as static tables in a header file.	2013-11-15 01:29:47 +01:00
Diego Biurrun	e8fcdebb17	build: Allow specifying extra object files when linking HOSTPROGS	2013-11-15 01:29:47 +01:00
Michael Niedermayer	9244a68092	Merge remote-tracking branch 'qatar/master' * qatar/master: h264: free the tables and uninitialize the context on flush Merged-by: Michael Niedermayer <michaelni@gmx.at>	2013-11-14 21:11:42 +01:00
Michael Niedermayer	074bae745d	Merge commit 'ecf442a58b09bdb1dc1d2c3904b82ac5f79b2878' * commit 'ecf442a58b09bdb1dc1d2c3904b82ac5f79b2878': lavf: improve support for AVC-Intra files. Conflicts: libavformat/internal.h libavformat/isom.c libavformat/mxfdec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2013-11-14 21:04:44 +01:00
Michael Niedermayer	0f969c00c6	Merge commit '951d819006730145255333749367c4ea722ffd9b' * commit '951d819006730145255333749367c4ea722ffd9b': mxfdec: update current edit unit when seeking in mxf files without index tables See: `f1e606c762` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2013-11-14 20:23:49 +01:00
Anton Khirnov	9eda9d3322	h264: free the tables and uninitialize the context on flush Prevents referencing empty frames when the first packet after the flush does not contain a frame.	2013-11-14 19:00:20 +01:00
Reimar Döffinger	ecf442a58b	lavf: improve support for AVC-Intra files. Generate extradata with SPS/PPS based on container dimensions. Authors of this commit are: Reimar and Thomas Mundt Signed-off-by: Anton Khirnov <anton@khirnov.net>	2013-11-14 18:59:39 +01:00
Marton Balint	951d819006	mxfdec: update current edit unit when seeking in mxf files without index tables Fixes audio packet pts values in some files generated by AVID TRMG 3.01. Signed-off-by: Marton Balint <cus@passwd.hu> Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Anton Khirnov <anton@khirnov.net>	2013-11-14 18:59:17 +01:00
Michael Niedermayer	54af7ce4ce	Merge remote-tracking branch 'qatar/master' * qatar/master: mpeg12dec: Remove outdated UV swapping code for VCR2 Not merged as this change would likely break VCR2 with XVMC The code can be removed when / in case XVMC is removed Merged-by: Michael Niedermayer <michaelni@gmx.at>	2013-11-14 16:17:43 +01:00
Michael Niedermayer	726566704f	Merge commit '669fe505952f3d8175b1ad6971033a8e8120523b' * commit '669fe505952f3d8175b1ad6971033a8e8120523b': twinvq: consume block_align+1 packets as full ones Conflicts: libavcodec/twinvq.c See: `2e7a1fdd6d` Merged-by: Michael Niedermayer <michaelni@gmx.at>	2013-11-14 16:02:11 +01:00
Michael Niedermayer	a24aef5dfa	Merge commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4' * commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4': twinvq: support multiple frames per packet Conflicts: libavcodec/twinvq.c Merged-by: Michael Niedermayer <michaelni@gmx.at>	2013-11-14 15:42:05 +01:00
Michael Niedermayer	2cfdc2879a	Merge commit 'ddb839e9286594ff7a862a956402106fca7055c9' * commit 'ddb839e9286594ff7a862a956402106fca7055c9': metasound: add missing modes Merged-by: Michael Niedermayer <michaelni@gmx.at>	2013-11-14 15:31:34 +01:00
Michael Niedermayer	1ac4797d19	Merge commit '7b9780e7bf9d86e3e4e9606a971bb2d0d718bac2' * commit '7b9780e7bf9d86e3e4e9606a971bb2d0d718bac2': mpeg12dec: Remove unused swap_uv member from Mpeg1Context Merged-by: Michael Niedermayer <michaelni@gmx.at>	2013-11-14 15:24:30 +01:00
Michael Niedermayer	7c888ae746	Merge commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4' * commit 'cce3e0a49f0dd030262c28d9c53de0bd2fd909c4': Move av_fast_{m,re}alloc from lavc to lavu. Conflicts: libavcodec/avcodec.h libavcodec/utils.c libavutil/mem.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2013-11-14 15:04:04 +01:00
Diego Biurrun	ad1161799e	mpeg12dec: Remove outdated UV swapping code for VCR2	2013-11-14 14:21:27 +01:00
Michael Niedermayer	2925571278	avcodec/mpegvideo_enc: Fix possibly exploitable security issue with -bf Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	2013-11-14 14:19:38 +01:00
Michael Niedermayer	9f32048dd1	Merge commit 'aa241229891173b0357eee04e6ca78f806cc9c0c' * commit 'aa241229891173b0357eee04e6ca78f806cc9c0c': lavc: deprecate FF_MAX_B_FRAMES Conflicts: libavcodec/options_table.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2013-11-14 14:11:03 +01:00
Michael Niedermayer	dbfa4317f3	Merge commit 'b6094811f9fca66cdf853420696e96fdc3e4987a' * commit 'b6094811f9fca66cdf853420696e96fdc3e4987a': lavc: move MB_TYPE_* macros from avcodec.h to mpegvideo.h Merged-by: Michael Niedermayer <michaelni@gmx.at>	2013-11-14 14:01:24 +01:00
Michael Niedermayer	d67d3e2977	Merge commit 'b45c87083de67969c1598cfef41e7c947b137922' * commit 'b45c87083de67969c1598cfef41e7c947b137922': lavc: schedule unused FF_QSCALE_TYPE_* for removal on next bump Merged-by: Michael Niedermayer <michaelni@gmx.at>	2013-11-14 13:49:02 +01:00
Kostya Shishkov	669fe50595	twinvq: consume block_align+1 packets as full ones They can be produced by VQF. Signed-off-by: Diego Biurrun <diego@biurrun.de>	2013-11-14 13:38:10 +01:00
Kostya Shishkov	1afa8a7568	twinvq: support multiple frames per packet Signed-off-by: Diego Biurrun <diego@biurrun.de>	2013-11-14 13:38:10 +01:00
Kostya Shishkov	ddb839e928	metasound: add missing modes Signed-off-by: Diego Biurrun <diego@biurrun.de>	2013-11-14 13:38:10 +01:00

1 2 3 4 5 ...

58130 Commits