generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
60,566 Commits 24 Branches 241 Tags 173 MiB
86316039ab
Commit Graph

27366 Commits

Author SHA1 Message Date
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
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
Kostya Shishkov
e95018b694 dnxhd: Support DNx444 
Bug-Id: 99
Bug-Id: videolan/9620
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2014-02-09 19:53:35 +01:00
Ronald S. Bultje
2f6eec65ac vp8: fix PPC assembly to work if src_stride != dst_stride 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
 2014-02-09 18:50:53 +01:00
Janne Grunau
6a8475dc4f asvenc: free avctx->coded_frame on codec close 2014-02-09 18:50:53 +01:00
Clément Bœsch
c333987876 vp9: fix compilation with !HAVE_FAST_64BIT. 
Spotted-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2014-02-09 18:44:20 +01:00
Martin Storsjö
d6eac2f1bc arm: Remove a stray .fpu directive 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-02-09 18:36:16 +01:00
Alexandra Khirnova
28e508a946 dnxhddec: return proper error code 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-02-09 18:36:16 +01:00
Ronald S. Bultje
0d4d223353 vp9: invert order in l[] intra prediction array. 
The directional intra predictors either don't care about order (dc, h,
dc_left, tm), or they prefer inverted order (vr, dr, hd). This allows
more efficient SIMD implementations.
 2014-02-09 18:07:15 +01:00
Ronald S. Bultje
37c6eac296 vp9: remove memset in loopfilter level setting loop. 
Use same function for segmentation map writing also.
 2014-02-09 18:07:14 +01:00
Ronald S. Bultje
45245e202e vp9: coef decoding context-splat speedup. 2014-02-09 18:07:14 +01:00
Ronald S. Bultje
fccd7d81b6 vp9: decode_mode context optimizations. 2014-02-09 18:07:14 +01:00
Ronald S. Bultje
1dc8559e25 vp9: more aligned zeroes. 2014-02-09 18:07:14 +01:00
Ronald S. Bultje
0c30c8ddc1 vp9: faster skip-block coefficient blanking. 2014-02-09 18:07:14 +01:00
Ronald S. Bultje
cdfcd06126 vp9: coef context reading optimization. 2014-02-09 18:07:14 +01:00
Ronald S. Bultje
9aeca1c572 vp9: just disallow temporal or no-update segmentation on size-change. 
The spec doesn't describe how it should be decoded so this is probably
the safest thing to do. Fixes valgrind errors on fuzzed11.ivf and fixes
valgrind errors on fuzzed10.ivf differently.
 2014-02-09 18:07:14 +01:00
mrlika
36a6297953 avcodec/dvbsubdec: DVB subtitles decoder: support of 5 bytes extradata format 
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-09 17:14:57 +01:00
Maxim Poliakovski
bc3f03567a g2meet: rename FRAME_INFO to more appropriate DISPLAY_INFO 
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2014-02-09 16:13:23 +01:00
Michael Niedermayer
4040b56f5a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mlp_parser: fix request_channel_layout behavior.

Conflicts:
	libavcodec/mlp_parser.c

See: bd35d58463
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-09 02:37:17 +01:00
Maxim Poliakovski
ae95b2f810 g2meet: Validate bpp and bitmasks in the display info 
That prevents processing of media files with
incompatible or unsupported settings.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-08 23:30:02 +01:00
Maxim Poliakovski
3f826039dd g2meet: factor out chunk seeking 
This version requires fewer code and is safer.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-08 23:09:57 +01:00
Maxim Poliakovski
cb2162adba g2meet: Rename FRAME_INFO to more appropriate DISPLAY_INFO 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-08 23:01:14 +01:00
Ronald S. Bultje
0c67864a37 vp9: don't allow retaining old segmentation maps after a size change. 
Fixes valgrind warnings on fuzzed10.ivf.
 2014-02-08 22:08:20 +01:00
Tim Walker
c1e7de8f62 mlp_parser: fix request_channel_layout behavior. 
When request_channel_layout is 0,
all substreams should be decoded.

Thanks to Michael Niedermayer for spotting.

Also fix a mismatch between the parser and
decoder when request_channel_layout is a
subset of Stereo.
 2014-02-08 20:10:51 +01:00