generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
53,351 Commits 24 Branches 241 Tags 173 MiB
14ec9d2590
Commit Graph

53351 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
6ce2c3106d vc1: Make INIT_LUT() self contained 
Move the local variables it uses into the macro, enclosing them
in a do {} while (0) scope.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-15 12:42:53 +03:00
Michael Niedermayer
3ac3edf63b Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Reduce probing score for flic animation files.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 11:37:58 +02:00
Michael Niedermayer
c7c71f95f8 replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_* 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 11:23:14 +02:00
Carl Eugen Hoyos
86ea021b3a Reduce probing score for flic animation files. 
Fixes ticket #2567.
 2013-05-15 11:20:39 +02:00
Michael Niedermayer
37f2ac36a9 vc1: Simplify code by using INIT_LUT() 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-15 12:13:53 +03:00
Michael Niedermayer
0379fc1487 vc1: Move INIT_LUT() further up to allow using it in more places 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-15 12:13:53 +03:00
Martin Storsjö
3ca3709ad4 vc1dec: Remove some now unused variables 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-15 12:13:53 +03:00
Michael Niedermayer
4162fc62b3 vc1dec: Do not allow field_mode to change after the first header 
This fixes out of array accesses.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-15 12:13:53 +03:00
Martin Storsjö
ec7d002e55 vc1, mss2: Check for any negative return value from ff_vc1_parse_frame_header 
This is required if we return other error codes than explicitly
-1, which so far has been the only other possible return value
besides 0.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-15 12:13:53 +03:00
Michael Niedermayer
ff4680922f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_*

Conflicts:
	doc/APIchanges
	libavcodec/avpicture.c
	libavcodec/ffv1dec.c
	libavcodec/ffv1enc.c
	libavcodec/imgconvert.c
	libavcodec/tiffenc.c
	libavfilter/vf_pixdesctest.c
	libavfilter/vf_scale.c
	libavutil/imgutils.c
	libavutil/pixdesc.c
	libavutil/version.h
	libswscale/swscale_internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 11:10:09 +02:00
Michael Niedermayer
ccb148e478 vc1dec: Fix current ptr selection in vc1_mc_4mv_chroma() 
No sample tried shows a difference.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-15 11:40:38 +03:00
Michael Niedermayer
201412ffec vc1dec: Factorize picture pointer selection in vc1_mc_4mv_chroma() 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-15 11:40:17 +03:00
Michael Niedermayer
2412ad1717 vc1dec: Factorize picture pointer selection code 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-15 11:39:57 +03:00
Michael Niedermayer
19673db34a vc1dec: Factorize srcU/V offseting 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-15 11:39:36 +03:00
Michael Niedermayer
012b319d91 vc1dec: Fix tff == 0 handling in init_block_index() 
This fixes several files from VLC ticket 5887.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-15 11:39:17 +03:00
Michael Niedermayer
75835abe91 Merge commit '7c57a582a03fb473091a88737ab92b9f2a5bb87a' 
* commit '7c57a582a03fb473091a88737ab92b9f2a5bb87a':
  jpeg2000dec: don't use deprecated PIX_FMT values

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 10:39:00 +02:00
Michael Niedermayer
0313653928 vc1dec: Update destination pointers in context for fields 
This replaces a large number of checks for the second field by
fixing the pointers when they are setup.

This should also fix I/BI field pictures.

Changes checksums for vc1_sa10143, the file becomes slightly closer
to what the reference decoder outputs.

Based on "vc1dec: the second field is written wrong to the picture"
by Sebastian Sandberg <sebastiand.sandberg@gmail.com>.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-15 11:38:49 +03:00
Michael Niedermayer
5692ad00f4 Merge commit 'ffba2053edfc177d217bf4a95edf51cd0fc40753' 
* commit 'ffba2053edfc177d217bf4a95edf51cd0fc40753':
  lavfi: fix compatibility code for old vf_scale options syntax

Conflicts:
	libavfilter/avfilter.c

No change as the buggy code does not exist in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 10:38:11 +02:00
Michael Niedermayer
aa6454e6ca Merge commit '096696ef0dd391d9430376d1444c1a3cde9171fd' 
* commit '096696ef0dd391d9430376d1444c1a3cde9171fd':
  avfiltergraph: simplify inserting conversion filters.
  Clarify output of av_get_bits_per_pixel

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 10:21:16 +02:00
Michael Niedermayer
85de84c3e0 Merge commit '7cbc4cb4424430586ce2d5c0dba81174c6d1db01' 
* commit '7cbc4cb4424430586ce2d5c0dba81174c6d1db01':
  fate: update the mmf reference
  mmf: Write metadata into an Optional Data chunk
  jpeg2000dec: Use correct printf length modifier for pointer differences

Conflicts:
	libavformat/mmf.c
	tests/ref/lavf/mmf

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 10:15:15 +02:00
Michael Niedermayer
23439cf99b Merge commit '5d9d8461fbb87046a7ca220d3676a045bd7ab46e' 
* commit '5d9d8461fbb87046a7ca220d3676a045bd7ab46e':
  vc1dec: Don't apply the loop filter on fields

Conflicts:
	tests/ref/fate/vc1_sa10143

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 10:07:15 +02:00
Michael Niedermayer
cb22692f05 Merge commit 'fe06795d783785a76c6cbcaa2cd3012e6deb5fa5' 
* commit 'fe06795d783785a76c6cbcaa2cd3012e6deb5fa5':
  vc1: implement frame interlaced b-frame header parsing

Conflicts:
	libavcodec/vc1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 09:57:28 +02:00
Michael Niedermayer
b602e47f12 Merge commit '46430fd47c6239ef8742d0a34f9412d5060fa798' 
* commit '46430fd47c6239ef8742d0a34f9412d5060fa798':
  vc1dec: Don't attempt error concealment on field pictures
  vc1dec: fieldtx is only valid for interlaced frame pictures
  aacenc: Fix erasure of surround channels
  aacenc: Fix target bitrate for twoloop quantiser search

Conflicts:
	libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 09:49:17 +02:00
Michael Niedermayer
772c801c7d Merge commit '7c71ada4cad3c6aab5fa24155c379465c41cfd76' 
* commit '7c71ada4cad3c6aab5fa24155c379465c41cfd76':
  aacenc: Fix a rounding bug in aacpsy channel bitrate computation
  yadif: correct strides in filter_edges_16bit
  yadif: restore speed of the C filtering code

Conflicts:
	libavfilter/x86/vf_yadif_init.c

No change as these commits where already in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 09:45:43 +02:00
Michael Niedermayer
6bf6b9c279 Merge commit '252c0bfdc014c1fb6ad4fe06242c7beca58a6b41' 
* commit '252c0bfdc014c1fb6ad4fe06242c7beca58a6b41':
  lavc: Fix msvc compilation of utils.c with -WX (warnings treated as errors)

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 09:39:07 +02:00
Anton Khirnov
e6c4ac7b5f pixdesc: rename PIX_FMT_* flags to AV_PIX_FMT_FLAG_* 2013-05-15 07:46:51 +02:00
Anton Khirnov
7c57a582a0 jpeg2000dec: don't use deprecated PIX_FMT values 2013-05-15 07:46:39 +02:00
Anton Khirnov
ffba2053ed lavfi: fix compatibility code for old vf_scale options syntax 
Currently it would incorrectly trigger on a string that contains a '='
but does not contain a ':', e.g. flags=<flags>.
 2013-05-15 07:46:04 +02:00
Anton Khirnov
096696ef0d avfiltergraph: simplify inserting conversion filters. 
There is now no need to explicitly pass 0:0 as width/height to scale,
those are the defaults.
 2013-05-15 07:45:51 +02:00
Kieran Kunhya
ede75ebc9b Clarify output of av_get_bits_per_pixel 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-05-15 07:45:09 +02:00
Clément Bœsch
bc1c90eabf lavfi/dctdnoiz: fix 10l typo in pr_height computation. 2013-05-15 03:19:49 +02:00
Michael Niedermayer
1a36c756d8 ffmpeg: free threads on error conditions. 
Fixes Ticket2562

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-15 01:28:59 +02:00
Clément Bœsch
7b43120c7c lavfi: add dctdnoiz filter. 2013-05-15 00:54:00 +02:00
Vignesh Venkatasubramanian
48de04f4ec avcodec/avpacket: Refactoring copy_side_data into a separate function 
Refactoring copy_side_data into a separate function so that it can be called
in cases where side data needs to be duplicated.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-14 22:51:12 +02:00
Michael Niedermayer
5d22ac488b libx264: zero x264_picture before use. 
This prevents use of uninitialized memory by ffmpeg later
(i_qpplus1)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-14 22:44:08 +02:00
Michael Niedermayer
640e524ff6 libavfilter/Makefile: unbreak make alltools 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-14 21:58:56 +02:00
Stefano Sabatini
2a1b7dee6d tools: add zmqsend tool, useful to test the zmq filters 2013-05-14 20:10:55 +02:00
Stefano Sabatini
7ddb0ef9af lavfi: add zmq filters 2013-05-14 20:10:44 +02:00
James Almer
dc7656279a lavu/hash: Fix name of SHA224 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-14 19:43:51 +02:00
Paul B Mahol
b24530019f lavfi/blend: timeline support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-14 17:41:50 +00:00
Michael Niedermayer
e751481cd8 swscale/output: silence compiler warnings about uninitialized variables 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-14 18:58:02 +02:00
Luca Barbato
7cbc4cb442 fate: update the mmf reference 
Using Optional Data chunk introduced changes the hash.
 2013-05-14 18:50:27 +02:00
Stefano Sabatini
e65c4a2330 doc/outdevs: fix typos (devices -> device) 2013-05-14 18:46:14 +02:00
Paul B Mahol
811b17fbad lavfi: cosmetics: fix vertical alignment for pads in some filters 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-14 15:31:56 +00:00
Yoshihisa Uchida
3dff1bf99c mmf: Write metadata into an Optional Data chunk 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-05-14 17:14:38 +02:00
Diego Biurrun
a349458e67 jpeg2000dec: Use correct printf length modifier for pointer differences 
Also eliminate an unnecessary cast. Fixes the following warning:
jpeg2000dec.c:1200:20: warning: format ‘%lX’ expects argument of type ‘long unsigned int’, but argument 5 has type ‘long long unsigned int’
 2013-05-14 16:46:56 +02:00
Michael Niedermayer
dc6f1a8dda avformat/srtdec: Fix pointer corruption 
This fixes use of uninitialized memory and possible out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-14 16:38:33 +02:00
Martin Storsjö
5d9d8461fb vc1dec: Don't apply the loop filter on fields 
Fixes read of uninitialized memory.

Based on a patch by Michael Niedermayer.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-05-14 14:36:00 +03:00
Michael Niedermayer
6b13f54262 vf_colorchannelmixer: round lut entries to nearest 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-14 12:51:22 +02:00
Michael Niedermayer
f268727a8f fate: change colorchannelmixers coefficients to be less unstable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-05-14 12:49:11 +02:00