x/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-08-09 07:19:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,346 Commits 40 Branches 430 Tags
6bf6d6ad498d760bb60b6973789ebbf9758c999e
Commit Graph
24984 Commits
Author SHA1 Message Date
Michael Niedermayer aa24729c21 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  pcm_bluray: Return AVERROR_INVALIDDATA instead of -1 on header errors

Conflicts:
	libavcodec/pcm-mpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 19:40:50 +02:00
Michael Niedermayer 83db013a06 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avcodec/options: Drop deprecation warning suppression macros

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 16:48:31 +02:00
Michael Niedermayer 7d03e60c12 Merge commit '86f4c59bd676672040b89d8fea4c9e3b59bfe7ab' 
* commit '86f4c59bd676672040b89d8fea4c9e3b59bfe7ab':
  twinvq: Split VQF-specific part from common TwinVQ decoder core

Conflicts:
	libavcodec/Makefile
	libavcodec/twinvq.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 16:37:08 +02:00
Michael Niedermayer a97f749990 Merge commit '4d8d16b596c63de85e52488734338fbb41238058' 
* commit '4d8d16b596c63de85e52488734338fbb41238058':
  twinvq: Prefix enums and defines shared with VoxWare MetaSound

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 16:29:35 +02:00
Michael Niedermayer 9648c8e57b Merge commit 'bc909626b0a3c107625f2cb4c85479d18de422a8' 
* commit 'bc909626b0a3c107625f2cb4c85479d18de422a8':
  twinvq: move all bitstream reading into single place

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 16:24:08 +02:00
Michael Niedermayer 0df55e1ba8 Merge commit 'a22ae9f0c579793f411e2bd7a8db557091a3a4ae' 
* commit 'a22ae9f0c579793f411e2bd7a8db557091a3a4ae':
  mpegts: Remove one 64-bit integer modulus operation per packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 16:23:32 +02:00
Michael Niedermayer 91062ddef1 Merge commit '43bacd5b7d3d265a77cd29d8abb131057796aecc' 
* commit '43bacd5b7d3d265a77cd29d8abb131057796aecc':
  vc1: check mb_height validity.

See: b5f4836f8c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 16:07:37 +02:00
Michael Niedermayer f606c6e92c Merge commit '090cd0631140ac1a3a795d2adfac5dbf5e381aa2' 
* commit '090cd0631140ac1a3a795d2adfac5dbf5e381aa2':
  vc1: check the source buffer in vc1_mc functions

Conflicts:
	libavcodec/vc1dec.c

See: 3a04c18d89
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 15:57:35 +02:00
Michael Niedermayer 560e9365b6 Merge commit 'bc54c2ae3ca6abd225dc331eafc12108513158de' 
* commit 'bc54c2ae3ca6abd225dc331eafc12108513158de':
  libx264: add shortcut for the bluray compatibility option

Conflicts:
	doc/encoders.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 15:26:04 +02:00
Michael Niedermayer 318d7a9638 avcodec/vdpau: include attributes.h, needed for attribute_deprecated 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 14:49:03 +02:00
Michael Niedermayer 66056f74a1 avcodec/vdpau.h: define FF_API_BUFS_VDPAU if its not defined 
Similar to 50fb8c1114

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 14:48:54 +02:00
Michael Niedermayer 9547e3eef3 Merge commit 'f824535a4a79c260b59d3178b8d958217caffd78' 
* commit 'f824535a4a79c260b59d3178b8d958217caffd78':
  vdpau: deprecate bitstream buffers within the hardware context

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 14:30:49 +02:00
Michael Niedermayer c3b2902320 Merge commit '2852740e23f91d6775714d7cc29b9a73e1111ce0' 
* commit '2852740e23f91d6775714d7cc29b9a73e1111ce0':
  vdpau: store picture data in picture's rather than codec's context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 14:25:26 +02:00
Michael Niedermayer 50fb8c1114 avcodec/vdpau.h: define FF_API_CAP_VDPAU if its not defined 
Prevent build failure for applicatins using the old API
This could be replaced be a include of version.h but some applications
would then need extern C wrapers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 14:15:17 +02:00
Michael Niedermayer 3b805dcaa9 Merge commit '549294fbbe1c00fee37dc4d3f291b98945e11094' 
* commit '549294fbbe1c00fee37dc4d3f291b98945e11094':
  vdpau: deprecate VDPAU codec capability

Conflicts:
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 13:54:05 +02:00
Michael Niedermayer bf36dc50ea Merge commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8' 
* commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8':
  vdpau: remove old-style decoders

Conflicts:
	libavcodec/allcodecs.c
	libavcodec/h263dec.c
	libavcodec/h264.c
	libavcodec/mpeg12dec.c
	libavcodec/mpeg4videodec.c
	libavcodec/vc1dec.c
	libavcodec/vdpau.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-06 13:24:22 +02:00
Christian Schmidt 1c6d2bb9a9 pcm_bluray: Return AVERROR_INVALIDDATA instead of -1 on header errors 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-08-06 13:19:29 +02:00
Diego Biurrun 0ba4ea312b avcodec/options: Drop deprecation warning suppression macros 
The options table is used in tools built by the host compiler and the
deprecation macros pull in bits that are not safe to use if host and
target compiler differ.
 2013-08-06 03:05:03 +02:00
Carl Eugen Hoyos 4c15f3491f Set bits_per_raw_sample when decoding pnm. 2013-08-06 00:26:21 +02:00
Kostya Shishkov 86f4c59bd6 twinvq: Split VQF-specific part from common TwinVQ decoder core 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-08-05 20:59:23 +02:00
Diego Biurrun 4d8d16b596 twinvq: Prefix enums and defines shared with VoxWare MetaSound 2013-08-05 20:19:11 +02:00
Kostya Shishkov bc909626b0 twinvq: move all bitstream reading into single place 
This is required for the future addition of VoxWare MetaSound decoder, for its
functions are mostly the same but bitstream reader is completely different
and bitstream format is slightly different too.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-08-05 19:37:47 +02:00
Ben Avison a22ae9f0c5 mpegts: Remove one 64-bit integer modulus operation per packet 
The common case of the pointer having increased by one packet (which results
in no change to the modulus) can be detected with a 64-bit subtraction,
which is far cheaper than a division on many platforms.

           Before          After
           Mean   StdDev   Mean   StdDev  Change
Divisions   248.3  8.8      51.5   7.4    +381.7%
Overall    2773.2 25.6     2372.5 43.1     +16.9%

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-05 19:25:55 +03:00
Luca Barbato 43bacd5b7d vc1: check mb_height validity. 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-08-05 16:24:13 +02:00
Luca Barbato 090cd06311 vc1: check the source buffer in vc1_mc functions 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-08-05 16:24:13 +02:00
Luca Barbato 9991298f2c bink: Bound check the quantization matrix. 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-08-05 16:24:13 +02:00
Luca Barbato bc54c2ae3c libx264: add shortcut for the bluray compatibility option 
As for intra-refresh it is just a commodity.
 2013-08-05 16:13:35 +02:00
Timothy Gu 3217a706e2 libxvid: Reduce the size of an array 
It is not possible to have a plugin[] array with 5 or more elements.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 15:11:17 +02:00
Michael Niedermayer 1ccc2157ff avcodec/libxvid: Partially check plugins array size with assert 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 15:06:04 +02:00
Michael Niedermayer 412df0a52f avcodec/libxvid: set lumi_aq for lumimasking 
Simplifies check and should fix lumi+vari warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 15:06:04 +02:00
Rémi Denis-Courmont f824535a4a vdpau: deprecate bitstream buffers within the hardware context 
The bitstream buffers are now private and freed by libavcodec. For
backward compatibility, the hold bitstream buffer pointer is left NULL
(applications were supposed to av_freep() it).

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-08-05 11:21:36 +02:00
Rémi Denis-Courmont 2852740e23 vdpau: store picture data in picture's rather than codec's context 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-08-05 11:20:41 +02:00
Rémi Denis-Courmont 549294fbbe vdpau: deprecate VDPAU codec capability 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-08-05 11:20:32 +02:00
Rémi Denis-Courmont 578ea75a9e vdpau: remove old-style decoders 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-08-05 11:15:49 +02:00
Michael Niedermayer 22458ccbcc avcodec/tta: use init_get_bits8() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 10:15:03 +02:00
Michael Niedermayer 263da1a8f7 avcodec/eatgq: use init_get_bits8() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 10:14:14 +02:00
Michael Niedermayer 5dff269998 avcodec/diracdec: use init_get_bits8() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 10:13:48 +02:00
Michael Niedermayer 6ed1aa4f85 avcodec/ra144dec: use init_get_bits8() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 10:13:21 +02:00
Michael Niedermayer d6c36fba0b Merge commit 'a10c4ce24bd4a0dd557d5849aa53a0cc74677808' 
* commit 'a10c4ce24bd4a0dd557d5849aa53a0cc74677808':
  aac: Forward errors properly in aac_decode_frame_int

Conflicts:
	libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 09:52:06 +02:00
Michael Niedermayer 48af87819a Merge commit '71953ebcf94fe4ef316cdad1f276089205dd1d65' 
* commit '71953ebcf94fe4ef316cdad1f276089205dd1d65':
  aac: Check init_get_bits return value

Conflicts:
	libavcodec/aacdec.c

See: 73abc3a634

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-05 09:46:04 +02:00
Michael Niedermayer 6bbcae2c16 avcodec/fft: Fix "warning: unused variable" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-04 22:52:10 +02:00
Luca Barbato a10c4ce24b aac: Forward errors properly in aac_decode_frame_int 
Incidentally also remove a warning.
 2013-08-04 16:05:36 +02:00
Luca Barbato 71953ebcf9 aac: Check init_get_bits return value 
Some code paths can call it with invalid length.

CC: libav-stable@libav.org
 2013-08-04 16:05:36 +02:00
Nedeljko Babic 18d7074b4e libavcodec: Implementation of 32 bit fixed point FFT 
Iterative implementation of 32 bit fixed point split-radix FFT.
Max FFT that can be calculated currently is 2^12.

Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-04 14:01:41 +02:00
Carl Eugen Hoyos 34d48dac25 avcodec/pnmdec: support more pnm files 
Fixes Ticket1897

Some hunks that have become unneeded due to previous changes removed by the commiter.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 15:00:20 +02:00
Michael Niedermayer 62738157dd pnmdec: always output native pixel format 
This simplifies the code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 15:00:15 +02:00
Michael Niedermayer 82fdfe8e51 Merge commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a' 
* commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a':
  avcodec: Add output_picture_number to AVCodecParserContext

Conflicts:
	doc/APIchanges
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 10:48:11 +02:00
Michael Niedermayer 1607a98545 avcodec/mlp: Fix bugs in libavs warning fixes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 10:27:42 +02:00
Michael Niedermayer 20be5e0a0e Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91' 
* commit '7950e519bb094897f957b9a9531cc60ba46cbc91':
  Disable deprecation warnings for cases where a replacement is available

Conflicts:
	libavcodec/avpacket.c
	libavcodec/pthread.c
	libavcodec/utils.c
	libavdevice/v4l2.c
	libavfilter/avfiltergraph.c
	libavfilter/buffersrc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 10:08:30 +02:00
Michael Niedermayer a8e963835a Merge commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e' 
* commit 'b5a138652ff8a5b987d3e1191e67fd9f6575527e':
  Give less generic names to global library option arrays

Conflicts:
	libavcodec/options_table.h
	libavfilter/avfilter.c
	libavformat/options_table.h
	libswscale/options.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-03 09:16:36 +02:00