Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity
60624 commits 38 branches 400 tags 186 MiB
Commit graph

27388 commits

Author SHA1 Message Date
Michael Niedermayer
a062bee1c1 Merge commit '066ad249843bde656265b59110c2521e2b1ce131' 
* commit '066ad249843bde656265b59110c2521e2b1ce131':
  h264_sei: reorder headers

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-14 14:18:04 +01:00
Michael Niedermayer
1d91af5aba Merge commit '304e916a92bc17385a485bec2f957e192257ddb6' 
* commit '304e916a92bc17385a485bec2f957e192257ddb6':
  h264_sei: name buffering period type consistently

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-14 14:13:06 +01:00
Michael Niedermayer
a7eb93b367 Merge commit '15210354cf27cf4e24d91f84d66cf471511ce718' 
* commit '15210354cf27cf4e24d91f84d66cf471511ce718':
  h264: drop outdated comments

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-14 14:07:19 +01:00
Michael Niedermayer
99b12357f4 Merge commit '3a0576702825423abecb32627c530dbc4c0f73bc' 
* commit '3a0576702825423abecb32627c530dbc4c0f73bc':
  h264: store current_sps_id inside the current sps

Conflicts:
	libavcodec/h264.c
	libavcodec/h264_ps.c

The current_sps_id is not removed as it used in security related code.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-14 13:58:02 +01:00
Michael Niedermayer
60b46a00c6 Merge commit '73e8fab31dc19c4371499e612856accbc00b2820' 
* commit '73e8fab31dc19c4371499e612856accbc00b2820':
  h264: print values in case of error

Conflicts:
	libavcodec/h264.c
	libavcodec/h264_ps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-14 13:35:45 +01:00
Michael Niedermayer
5cbd7ce016 Merge commit 'f8c507f44b4c994895fc7ad954f009f61de69b1c' 
* commit 'f8c507f44b4c994895fc7ad954f009f61de69b1c':
  h264: Refactor ff_h264_decode_ref_pic_list_reordering

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-14 13:24:30 +01:00
Vittorio Giovara
066ad24984 h264_sei: reorder headers 
Also drop unused assert.h.
 2014-02-14 05:10:58 +01:00
Vittorio Giovara
304e916a92 h264_sei: name buffering period type consistently 2014-02-14 05:08:47 +01:00
Vittorio Giovara
15210354cf h264: drop outdated comments 2014-02-14 05:08:37 +01:00
Vittorio Giovara
3a05767028 h264: store current_sps_id inside the current sps 
In preparation for MVC support.
 2014-02-14 05:05:46 +01:00
Vittorio Giovara
73e8fab31d h264: print values in case of error 
Also make error style consistent and drop redundant information.
 2014-02-14 05:05:35 +01:00
Michael Niedermayer
abe3f79d62 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mpeg12dec: do not add stereo3D side data to a non-existing frame

Conflicts:
	libavcodec/mpeg12dec.c

See: fe285b04bb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-14 04:11:37 +01:00
Michael Niedermayer
84873794ad Merge commit 'f795a8a8bf5e312dad2c2829c543b9d309376ca1' 
* commit 'f795a8a8bf5e312dad2c2829c543b9d309376ca1':
  h264: make context_count unsigned

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-14 01:24:26 +01:00
Luca Barbato
f8c507f44b h264: Refactor ff_h264_decode_ref_pic_list_reordering 
In preparation for MVC support.
 2014-02-13 23:34:50 +01:00
Derek Buitenhuis
25bc8390bb libx265: Remove redundant default param call 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-13 22:22:21 +00:00
Derek Buitenhuis
955544e4d0 libx265: Fix use of uninitialized input picture 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-13 22:22:20 +00:00
James Almer
e87974bc00 flac/x86: add ff_flac_lpc_32_xop() 
Tested on an AMD FX 6300

679081 decicycles in ff_flac_lpc_32_xop, 32768 runs
774425 decicycles in ff_flac_lpc_32_sse4, 32768 runs

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-13 22:14:59 +01:00
James Darnley
623f380a18 lavc: fix flac encoder and decoder dependencies 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-13 21:00:32 +01:00
Janne Grunau
73eca738ac mpeg12dec: do not add stereo3D side data to a non-existing frame 
User data is usually coded before slice data. That means the frame
the user data belongs to is not available while parsing the user data.
The stereo3D side data has to use the same indirection over the private
context as pan scan information and A53 captions.

Bug-Id:632
 2014-02-13 13:03:01 +01:00
Michael Niedermayer
ccc48b318b avcodec/arm/int_neon: fix handling sizes % 16 != 0 
This assumes the array is sufficiently padded with 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-13 02:20:08 +01:00
James Almer
429f742a61 tta: split off hybrid filter processing as ttadsp 
Signed-off-by: James Almer <jamrial@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-13 01:34:33 +01:00
Michael Niedermayer
86316039ab Merge commit '50ea93158d4c480f64069e8bd1da388486dcf4ba' 
* commit '50ea93158d4c480f64069e8bd1da388486dcf4ba':
  Add libx265 encoder

Conflicts:
	Changelog
	LICENSE
	configure
	libavcodec/allcodecs.c
	libavcodec/libx265.c
	libavcodec/version.h

See: bb6b1731eb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-13 00:15:28 +01:00
Janne Grunau
f795a8a8bf h264: make context_count unsigned 
Removes the bogus but scary looking warning 'libavcodec/h264.c:4529:49:
warning: array subscript is below array bounds [-Warray-bounds]'.
 2014-02-12 15:48:03 +01:00
Michael Niedermayer
8c5fece11f Merge commit '462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6' 
* commit '462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6':
  aacdec: set AVFrame sample_rate

Conflicts:
	libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-12 15:00:03 +01:00
Derek Buitenhuis
50ea93158d Add libx265 encoder 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-12 13:13:17 +00:00
Derek Buitenhuis
bb6b1731eb Add libx265 encoder 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-12 13:12:22 +00:00
John Stebbins
462d5e8e6c aacdec: set AVFrame sample_rate 
AVFrame.sample_rate is set in ff_get_buffer, but aacdec calls
ff_get_buffer before the samplerate is known. So it needs to be
set again before returning the frame.
 2014-02-12 12:52:28 +01:00
Michael Niedermayer
c33351f3e7 avcodec/mpegaudio_parser: Delay setting codec_id if it appears wrong 
Fixes mp1/mp3 in mp4 misdetection

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-12 00:11:16 +01:00
Michael Niedermayer
5669ae8401 avcodec/mpegaudio_parser: treat codec_id like the other parameters 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-12 00:10:35 +01:00
Michael Niedermayer
d3068d25ca avcodec: Add avpriv_mpa_decode_header2() 
The difference to avpriv_mpa_decode_header() is that it doesnt need or modify the context

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-11 23:57:47 +01:00
Michael Niedermayer
707a07f3c2 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavc: set AVFrame pkt_pts and reordered_opaque in reget_buffer

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-11 23:21:03 +01:00
Michael Niedermayer
bde58d9901 Merge commit '6477449243db4aab15a4db356e8354c60b5366ec' 
* commit '6477449243db4aab15a4db356e8354c60b5366ec':
  g2meet: make JPEG tile decoder operate on 8x8 block mask

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-11 23:12:29 +01:00
John Stebbins
52771346dc lavc: set AVFrame pkt_pts and reordered_opaque in reget_buffer 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-02-11 14:25:01 +01:00
Kostya Shishkov
6477449243 g2meet: make JPEG tile decoder operate on 8x8 block mask 
This is needed for upcoming Go2Meeting (G2M2/G2M3) decoder.
 2014-02-11 12:46:27 +01:00
Maxim Poliakovski
d6d7851801 g2meet: factor out seeking to the chunk end 
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2014-02-11 12:46:11 +01:00
Michael Niedermayer
8f92edf6f8 avcodec/ra144: remove redundant AV_ZERO128 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 21:52:45 +01:00
Christophe Gisquet
c3390fd56c ra144: use scalarproduct_int16 
The buffer holding the coefficients must be padded with 0 so as to use DSP
functions that may overread. Currently, the SSE2/3 versions is an example,
as they process batches of 16 bytes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 21:45:55 +01:00
Michael Niedermayer
dfc99ca04d Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rpza: limit the number of blocks to the total remaining blocks in the frame

See: 3819db745d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 21:28:38 +01:00
Michael Niedermayer
996fdca8fb Merge commit 'a46dc49744bdc4f2e31725b63ac8e41f701e4fa1' 
* commit 'a46dc49744bdc4f2e31725b63ac8e41f701e4fa1':
  rpza: move some variables to the blocks where they are used

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 20:46:03 +01:00
Michael Niedermayer
0a4311dee5 Merge commit 'c7769df178fd670156f1c11f6c8410ddd59bbfee' 
* commit 'c7769df178fd670156f1c11f6c8410ddd59bbfee':
  rpza: use fixed-width int types

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 20:41:00 +01:00
Michael Niedermayer
8b0befe451 Merge commit 'e1218ce9149aad0ae9770a32a78d77ad2210bd64' 
* commit 'e1218ce9149aad0ae9770a32a78d77ad2210bd64':
  rpza: switch to bytestream2

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 20:32:15 +01:00
Anton Khirnov
77bb0004bb rpza: limit the number of blocks to the total remaining blocks in the frame 
Fixes invalid writes.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org
 2014-02-10 15:22:28 +01:00
Anton Khirnov
a46dc49744 rpza: move some variables to the blocks where they are used 2014-02-10 15:22:01 +01:00
Anton Khirnov
c7769df178 rpza: use fixed-width int types 2014-02-10 15:21:35 +01:00
Anton Khirnov
e1218ce914 rpza: switch to bytestream2 2014-02-10 15:18:21 +01:00
Michael Niedermayer
03911c418f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  hevc: Conceal zero td

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 03:54:54 +01:00
Michael Niedermayer
51290068fa Merge commit 'e95018b694c0774477abec5bbf86ecc7946a9a28' 
* commit 'e95018b694c0774477abec5bbf86ecc7946a9a28':
  dnxhd: Support DNx444

Conflicts:
	Changelog
	libavcodec/dnxhddata.c
	libavcodec/dnxhddec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 03:42:06 +01:00
Michael Niedermayer
b7c6ccc1e6 Merge commit 'd6eac2f1bcce0cb85fac5d50fcfe94bc490d4a5e' 
* commit 'd6eac2f1bcce0cb85fac5d50fcfe94bc490d4a5e':
  arm: Remove a stray .fpu directive

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-09 20:57:55 +01:00
Michael Niedermayer
8c596864cd Merge commit '28e508a94677d5dffde009c5f8ca7d6a4d2ca8e8' 
* commit '28e508a94677d5dffde009c5f8ca7d6a4d2ca8e8':
  dnxhddec: return proper error code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-09 20:52:05 +01:00
Luca Barbato
246d3bf0ec hevc: Conceal zero td 
It was done only in check_mvset(), while mv_scale() is called also by
dist_scale().

Sample-Id: 00001579-google
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2014-02-09 19:53:43 +01:00