generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
61,004 Commits 24 Branches 241 Tags 173 MiB
c4c2b2ea5c
Commit Graph

61004 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
1e5656bf8a Merge commit 'b5f851ed7e59f88b4130a420033d9fe191ec9e2f' 
* commit 'b5f851ed7e59f88b4130a420033d9fe191ec9e2f':
  FATE: force FLAC in the lavf ogg test

Conflicts:
	tests/lavf-regression.sh

See: 28caf13ac3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 12:39:55 +01:00
Michael Niedermayer
6732f4350d Merge commit '38893dc028e458eaf3f906833d4ee515689edb7e' 
* commit '38893dc028e458eaf3f906833d4ee515689edb7e':
  pcmdec: replace a reachable assert with an error check

Conflicts:
	libavformat/pcmdec.c

No assert removed as there was none in FFmpeg in the equivalent function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 12:36:32 +01:00
Michael Niedermayer
ee2c1e6dd3 Merge commit 'cca4742a5e663cfe4dbd71f01f0c0fb042fddc1d' 
* commit 'cca4742a5e663cfe4dbd71f01f0c0fb042fddc1d':
  doc/APIchanges: mark the place where 9 was branched

Conflicts:
	doc/APIchanges

Not merged, as "9" was not a FFmpeg release and not branched anywhere from our APIChanges list

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 12:29:05 +01:00
Michael Niedermayer
2e99867a4e Merge commit 'd711d839ca6714a5ef5b53ee51bc7632e62cf203' 
* commit 'd711d839ca6714a5ef5b53ee51bc7632e62cf203':
  doc/APIchanges: fill in missing hashes and dates

Conflicts:
	doc/APIchanges

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 12:17:35 +01:00
Anton Khirnov
18c896be3d lavf: extend / improve the AVFormatContext doxy 2014-02-10 11:46:49 +01:00
Anton Khirnov
54f7e79d47 lavf: add some basic documentation of the muxing process 2014-02-10 11:44:21 +01:00
Anton Khirnov
4c75059950 lavf: rewrite the av_write_frame() doxy 
Remove some vague / incorrect statements and make the text more specific
and less confusing.
 2014-02-10 11:37:30 +01:00
Anton Khirnov
ad7f2b69a5 lavf: rewrite the av_interleaved_write_frame() doxy 
Remove some vague / incorrect statements and make the text more specific
and less confusing.
 2014-02-10 11:34:41 +01:00
Anton Khirnov
b36bc81cca avplay: add support for seeking to chapter marks 2014-02-10 11:23:01 +01:00
Guillaume Martres
f548f9f9e7 hevc: update conformance streams 
New streams: LTRPSPS_A_Qualcomm_1, SLPPLP_A_VIDYO_1, VPSID_A_VIDYO_1
Updated streams: EXT_A_ericsson_4, NUT_A_ericsson_5, RPS_C_ericsson_5,
  RPS_D_ericsson_6

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2014-02-10 07:48:41 +01:00
Anton Khirnov
b5f851ed7e FATE: force FLAC in the lavf ogg test 
Since b0c2c09, vorbis would be used if libvorbis is compiled in.
 2014-02-10 07:43:40 +01:00
Anton Khirnov
38893dc028 pcmdec: replace a reachable assert with an error check 
Libavformat should not make any assumptions about values returned from
other libraries. This assert is easily reachable by using a non-raw
codec id.
 2014-02-10 07:41:21 +01:00
Anton Khirnov
cca4742a5e doc/APIchanges: mark the place where 9 was branched 2014-02-10 07:29:27 +01:00
Anton Khirnov
d711d839ca doc/APIchanges: fill in missing hashes and dates 2014-02-10 07:29:27 +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
d84f1a60e0 Merge commit '2f6eec65acc953faed3951fb8f1eabed830fdd2f' 
* commit '2f6eec65acc953faed3951fb8f1eabed830fdd2f':
  vp8: fix PPC assembly to work if src_stride != dst_stride

See: 34b429d5ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 02:21:40 +01:00
Michael Niedermayer
ec1a1be54f Merge commit 'b37effdc52835e121a0e259e57273a19f9cd61a3' 
* commit 'b37effdc52835e121a0e259e57273a19f9cd61a3':
  mxfdec: free descriptor extradata in .read_close()

See: 9f92e590ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-10 01:08:51 +01:00
Michael Niedermayer
682e289b97 Merge commit '6a8475dc4f10d65edb7faa8df6e035af0ddcce19' 
* commit '6a8475dc4f10d65edb7faa8df6e035af0ddcce19':
  asvenc: free avctx->coded_frame on codec close

Not merged as we do not allocate coded_frame

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-09 22:40:41 +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
Michael Niedermayer
28caf13ac3 fate: fix lavf-ogg test 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-09 20:10:02 +01:00
Michael Niedermayer
cf0e5b7fd4 Merge commit 'b0c2c097e422b9e10a7d856582f8321d28af821e' 
* commit 'b0c2c097e422b9e10a7d856582f8321d28af821e':
  lavf: default .ogg audio to libvorbis if we can

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-09 20:04:01 +01:00
Michael Niedermayer
5b23c7ed6f Merge commit 'bc3f03567a04a9f7e412bcf2ca09c163f3f13941' 
* commit 'bc3f03567a04a9f7e412bcf2ca09c163f3f13941':
  g2meet: rename FRAME_INFO to more appropriate DISPLAY_INFO

Conflicts:
	libavcodec/g2meet.c

See: cb2162adba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-09 20:02:07 +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
Michael Niedermayer
ffe987b96d Merge commit '722554788b77c13748e83458f626a9ac38b70072' 
* commit '722554788b77c13748e83458f626a9ac38b70072':
  Add raw HEVC muxer

Conflicts:
	libavformat/version.h

See: ef5d32b9c5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-09 19:43:18 +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
b37effdc52 mxfdec: free descriptor extradata in .read_close() 
Fixes memleak in fate-mxf-demux.
 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
Andrew Kelley
b0c2c097e4 lavf: default .ogg audio to libvorbis if we can 
Since 2007, the Xiph.org Foundation recommends that .ogg only be used
for Ogg Vorbis audio files.

Source: http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions

However we only do it if we have libvorbis available because the
built in vorbis encoder is not as good.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-02-09 18:36:15 +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
Ramiro Polla
5965adeb20 lavd: add decklink output device 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-09 17:15:19 +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
Derek Buitenhuis
ef5d32b9c5 Add raw HEVC muxer 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-09 14:29:07 +00:00
Derek Buitenhuis
722554788b Add raw HEVC muxer 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2014-02-09 14:15:44 +00: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
Michael Niedermayer
73be2ebe96 Merge commit 'f90a4bfc43c9192e89d9b4c81d80789cd9b38a2f' 
* commit 'f90a4bfc43c9192e89d9b4c81d80789cd9b38a2f':
  mlpdec: fix request_channel_layout behavior.

See: 1a8050ad61
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-02-09 01:32: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