generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
58,340 Commits 24 Branches 241 Tags 173 MiB
9cbe834dfd
Commit Graph

26300 Commits

Author SHA1 Message Date
gcocherel
fb7d70c1cd hevc : add hevc profile 
(cherry picked from commit 0c8dfd8ad6400b33da55a9f4d9aa8d3f5c9d209f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 01:29:02 +01:00
gcocherel
36658c978f hevc : update hevc_ps.c 
(cherry picked from commit 088f2eb1ae42bffc63c2cee4e7eba8f47056043b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-22 01:29:02 +01:00
Clément Bœsch
616da59542 avcodec/x86/vp9dsp: merge a few SWAP together. 2013-11-21 23:06:21 +01:00
gcocherel
81d0252dac hevc : update hls_decode_neighbour(cherry picked from commit 14341c6d9a6885657ba365807223e96a67d6c0ed) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-21 22:51:51 +01:00
gcocherel
0afa254d4e hevc : fix pcm(cherry picked from commit 12bbfdba1899d11044d2bd8457159fc8b4b52a76) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-21 22:51:51 +01:00
Michael Niedermayer
6a7980e2cd Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  dct/fft: Give consistent names to fixed/float template files

Conflicts:
	libavcodec/fft_fixed.c
	libavcodec/fft_float.c
	libavcodec/mdct_fixed.c
	libavcodec/mdct_float.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-21 19:26:01 +01:00
Diego Biurrun
ac0e03bab0 dct/fft: Give consistent names to fixed/float template files 2013-11-21 15:59:46 +01:00
Michael Niedermayer
78bfc417d4 Merge branch 'master' of https://github.com/upsuper/ffmpeg-vdadec 
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-21 14:40:10 +01:00
Michael Niedermayer
fdc0b3f8c1 avcodec/utils: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-21 14:17:00 +01:00
Vittorio Giovara
305d3d9f1f mpeg4videoenc: restore macro parentheses 
These were erroneously removed in 8769113acc.
 2013-11-21 12:58:12 +01:00
Michael Niedermayer
01923bab98 avcodec: move end zeroing code from av_packet_split_side_data() to avcodec_decode_subtitle2() 
This code changes the input packet, which is read only and can in
rare circumstances lead to decoder errors. (i run into one of these in
the audio decoder, which corrupted the packet during av_find_stream_info()
so that actual decoding that single packet failed later)
Until a better fix is implemented, this commit limits the problem.
A better fix might be to make the subtitle decoders not depend on
data[size] = 0 or to copy their input when this is not the case.
 2013-11-21 03:13:26 +01:00
Sean McGovern
a7b87ca911 libxavs: rename and fix a variable name 
It was mis-spelled in b18c7c8d3d.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-20 21:06:31 +01:00
Michael Niedermayer
e50278348a avcodec/avpacket: fix order of operations in case of too large allocation 
Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-20 19:44:21 +01:00
Ben Boeckel
34b7c82dd3 avcodec/utils: use the unpack_dictionary function 
Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-20 18:23:24 +01:00
Michael Niedermayer
fcb1b0078d avcodec/avpacket: use size_t, fix potential integer overflow 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-20 17:35:48 +01:00
Ben Boeckel
c28b61caf0 Document new APIs for av_packet_{un, }pack_dictionary() 
Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Reveiwed-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-20 17:03:19 +01:00
Ben Boeckel
51a84a6bca avpacket: add pack/unpack functions for AVDictionary 
These functions are intended for use with side_data which comes in an
AVPacket.

Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Reviewed-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-20 16:48:51 +01:00
Ben Boeckel
1e506a2cc5 avcodec: add side_data type for updated metadata 
This type is intended to be used to allow codecs to pass updated
metadata to applications.

Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Reviewed-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-20 16:48:51 +01:00
Xidorn Quan
973b1a6b90 vda_h264_dec: backup context before overriding 
Some of context fields which must be overrided by this wrapper decoder
may be set and used by user, so we have to save and restore them before
and after invoking the inner decoder to secure user.
 2013-11-20 22:40:54 +08:00
Michael Niedermayer
6c04c5f733 avcodec/h261enc: dont use current_mv_x/y 
Fixes -mbd rd
Fixes Ticket3151

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-20 15:28:46 +01:00
Michael Niedermayer
cccdaa406a avcodec/h261enc: avoid use of current/previous_mba 
Fixes part of Ticket3151

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-20 15:14:01 +01:00
Michael Niedermayer
61f40fbb52 Merge commit 'ffb0af7f17eb0da86e9b140e86a1404d3c6c9e79' 
* commit 'ffb0af7f17eb0da86e9b140e86a1404d3c6c9e79':
  ac3dec: simplify an expression

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-20 04:20:36 +01:00
Michael Niedermayer
05493c6e72 avcodec/avpacket: correctly set the number of side data elements in av_copy_packet_side_data() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-20 00:23:23 +01:00
Michael Niedermayer
d5d29ae3b0 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  dv_tablegen: Remove CONFIG_SMALL preprocessor check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-19 22:03:27 +01:00
Tim Walker
ffb0af7f17 ac3dec: simplify an expression 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-11-19 18:52:17 +01:00
Michael Niedermayer
066dbfe165 Merge commit '6f1ec8edf2416441e2348f3a0915c9fee179d7da' 
* commit '6f1ec8edf2416441e2348f3a0915c9fee179d7da':
  avcodec.h: include version.h before using version macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-19 18:19:06 +01:00
Michael Niedermayer
8983dea426 Merge commit 'c673fc919c374c60b1e6d80d8822712eadf67f16' 
* commit 'c673fc919c374c60b1e6d80d8822712eadf67f16':
  hevc_sei: drop unused parameter

Conflicts:
	libavcodec/hevc_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-19 17:59:47 +01:00
Michael Niedermayer
2c6e693c97 Merge commit 'd234c7a07c1313fd215e8e242492bf71f5f3321e' 
* commit 'd234c7a07c1313fd215e8e242492bf71f5f3321e':
  mpeg4videodec: K&R formatting cosmetics

Conflicts:
	libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-19 17:53:14 +01:00
Michael Niedermayer
18df75fa2f Merge commit '8769113accf1f3b78634dec60b37f7354ed6d88d' 
* commit '8769113accf1f3b78634dec60b37f7354ed6d88d':
  mpeg4videoenc: K&R formatting cosmetics

Conflicts:
	libavcodec/mpeg4videoenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-19 16:19:42 +01:00
Diego Biurrun
57f13fd7e9 dv_tablegen: Remove CONFIG_SMALL preprocessor check 
The code does in no way depend on CONFIG_SMALL.
 2013-11-19 16:04:27 +01:00
Vittorio Giovara
6f1ec8edf2 avcodec.h: include version.h before using version macro 2013-11-19 14:48:36 +01:00
Vittorio Giovara
c673fc919c hevc_sei: drop unused parameter 2013-11-19 14:48:36 +01:00
Vittorio Giovara
d234c7a07c mpeg4videodec: K&R formatting cosmetics 2013-11-19 14:48:36 +01:00
Vittorio Giovara
8769113acc mpeg4videoenc: K&R formatting cosmetics 2013-11-19 14:48:36 +01:00
Michael Niedermayer
32ab5b82f4 Merge commit '69d4dbfd1faa99563065329656bbe597d612ca03' 
* commit '69d4dbfd1faa99563065329656bbe597d612ca03':
  aac_ac3_parser: simplify an expression

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-19 04:14:21 +01:00
Michael Niedermayer
8540368582 Merge commit '37a3cac78c6b13dc4e2c4f33ef53eed722d6f7b9' 
* commit '37a3cac78c6b13dc4e2c4f33ef53eed722d6f7b9':
  dcadec: simplify an expression

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-19 04:09:03 +01:00
Michael Niedermayer
56e122787e Merge commit 'a553c6a347d3d28d7ee44c3df3d5c4ee780dba23' 
* commit 'a553c6a347d3d28d7ee44c3df3d5c4ee780dba23':
  lavc: use buf[0] instead of data[0] in checks whether a frame is allocated

Conflicts:
	libavcodec/h264_refs.c
	libavcodec/mpegvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-19 03:56:53 +01:00
Kostya Shishkov
16e7b189c5 mpegvideo: Fix swapping of UV planes for VCR2 2013-11-19 02:05:51 +01:00
Tim Walker
69d4dbfd1f aac_ac3_parser: simplify an expression 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-11-19 02:02:53 +01:00
Tim Walker
37a3cac78c dcadec: simplify an expression 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-11-19 02:02:49 +01:00
Michael Niedermayer
f0f04fd842 avcodec/asvenc: remove code allocating dummy coded_frame 
Fixes memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-18 23:21:20 +01:00
Michael Niedermayer
918cab1a9f avcodec/pcm-dvd: print actual block size values in block size changed warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-18 21:00:03 +01:00
Michael Niedermayer
4adf1fe34f avcodec/pcm-dvd: fix incorrectly printed warning about changed block sizes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-18 21:00:03 +01:00
Michael Niedermayer
ab184b298d avcodec/pcm-dvd: fix 20/24bit 1 channel 
Fixes part of ticket3122

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-18 21:00:03 +01:00
Michael Niedermayer
5db49fc38d avcodec/pcm-dvd: fix 20bit 2 channels 
Fixes part of ticket3122

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-18 21:00:03 +01:00
Carl Eugen Hoyos
2974050cf5 Add a lavc Makefile dependency for the elbg filter. 
Fixes compilation with --disable-encoders

Reported by trac user Julian in ticket #3140.
 2013-11-18 18:12:11 +01:00
Anton Khirnov
a553c6a347 lavc: use buf[0] instead of data[0] in checks whether a frame is allocated 
data[0] may be NULL for valid frames with hwaccel pixel formats.
 2013-11-18 18:09:48 +01:00
Carl Eugen Hoyos
3f2ce316cd Add a Makefile rule for the little-endian G.726 decoder. 
Fixes compilation with --disable-everything --enable-decoder=adpcm_g726le
 2013-11-18 17:51:28 +01:00
Paul B Mahol
74906d3727 avcodec/libopusenc: change default frame duration to 20 ms 
20 ms is used by libopus encoder.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-18 01:46:32 +00:00
Michael Niedermayer
cda3c00475 avcodec/h261enc: remove unused variables 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-18 10:04:17 +01:00