har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,240 Commits 2 Branches 401 Tags
Commit Graph

14030 Commits

Author SHA1 Message Date
Michael Niedermayer
a8dec360c5 avformat/utils: dont count attached pics toward the probesize 
Such pics behave more like headers which we also dont count.
Fixes Ticket3146

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-18 03:02:36 +01:00
Michael Niedermayer
0ee905e243 Merge commit '5b9c3b4505206143d85398c1410949319fa1180f' 
* commit '5b9c3b4505206143d85398c1410949319fa1180f':
  Replace all instances of avcodec_alloc_frame() with av_frame_alloc().

Conflicts:
	doc/examples/decoding_encoding.c
	doc/examples/muxing.c
	ffmpeg.c
	libavcodec/alacenc.c
	libavcodec/libopenjpegenc.c
	libavcodec/libvpxenc.c
	libavcodec/pcm.c
	libavcodec/xbmenc.c
	libavcodec/xwdenc.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-16 23:54:10 +01:00
Anton Khirnov
5b9c3b4505 Replace all instances of avcodec_alloc_frame() with av_frame_alloc(). 2013-11-16 12:44:20 +01:00
Byte
d04b7de786 avformat/rtmphttp: Partial fix for the ticket #3127 (second try) 
Reviewed-by: Lukasz M <lukasz.m.luki@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-16 02:45:58 +01:00
Jan Gerber
8cc59ec881 lavf/matroskadec ReferenceBlock is a signed integer 
according to the Matroska Specification
ReferenceBlock is a signed integer too.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-16 01:24:40 +01:00
Jan Gerber
f4b1ca99ff lavf/matroska*: DiscardPadding is a signed integer 
according to the Matriska Specification
 http://matroska.org/technical/specs/index.html
DiscardPadding is a signed integer.

Tested-by: Jan Gerber <j@v2v.cc>
Tested-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-16 00:49:23 +01:00
Michael Niedermayer
cddd15ba5c avformat/matroska: simplify signed int access code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-15 21:38:23 +01:00
Jan Gerber
d03eea36b2 lavf/matroska*: add support for signed integers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-15 21:38:12 +01:00
Compn
5592d1b741 riff: add G264 to mpeg4, only decodes keyframes 2013-11-15 09:46:35 -05:00
Michael Niedermayer
e28130bcaf Merge commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4' 
* commit '3cbe1126530449336e2ce59b194bdb8c4eb4abb4':
  dv: Split DV data table declarations into their own header

Conflicts:
	libavcodec/dvdata.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-15 12:52:19 +01:00
Diego Biurrun
3cbe112653 dv: Split DV data table declarations into their own header 
This is necessary to avoid target config settings bleeding into the host
compilation process with hardcoded tables and the DV VLC tables no longer
present as static tables in a header file.
 2013-11-15 01:29:47 +01:00
Michael Niedermayer
074bae745d Merge commit 'ecf442a58b09bdb1dc1d2c3904b82ac5f79b2878' 
* commit 'ecf442a58b09bdb1dc1d2c3904b82ac5f79b2878':
  lavf: improve support for AVC-Intra files.

Conflicts:
	libavformat/internal.h
	libavformat/isom.c
	libavformat/mxfdec.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-14 21:04:44 +01:00
Reimar Döffinger
ecf442a58b lavf: improve support for AVC-Intra files. 
Generate extradata with SPS/PPS based on container dimensions.

Authors of this commit are: Reimar and Thomas Mundt

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-14 18:59:39 +01:00
Marton Balint
951d819006 mxfdec: update current edit unit when seeking in mxf files without index tables 
Fixes audio packet pts values in some files generated by AVID TRMG 3.01.

Signed-off-by: Marton Balint <cus@passwd.hu>
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-14 18:59:17 +01:00
Michael Niedermayer
4abe6e4153 avformat/nullenc: mark null as VFPS 
This avoids frame duplication for null output
avoiding unneeded computations.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-13 22:56:18 +01:00
Michael Niedermayer
269f5d902a avformat/aviobuf: return error from avio_put_str16le() for invalid input 
Found-by: Stefano Sabatini
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-13 19:16:27 +01:00
Michael Niedermayer
b52ae27edf avio_put_str16le: Print error message in case of invalid UTF8 input 
Found-by: Stefano Sabatini
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-13 19:09:04 +01:00
Michael Niedermayer
7561974dfe avformat/mmst: propagate error code from avio_put_str16le() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-13 18:04:11 +01:00
Michael Niedermayer
e3fc4481b6 avformat/vqf: check a few more bits in probe 
Fixes probetest failure
The threshold is choosen so that a all printale ascii string will never be
detected as vqf

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-13 01:36:09 +01:00
Michael Niedermayer
0062869ae2 avformat/smacker: check width/height in probe 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-12 19:37:37 +01:00
Michael Niedermayer
f9b89b61f8 avformat/electronicarts: check chunksize more completely in probe() 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-11 21:31:56 +01:00
Michael Niedermayer
20769d9349 avformat/electronicarts: check chunk size. 
Fix infinite loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-11 19:51:12 +01:00
Michael Niedermayer
bdab2421a5 avformat/dfa: check first frame offset in probe 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-11 19:38:38 +01:00
Michael Niedermayer
f66f3819b9 avformat/bethsoftvid: check 4th header byte in probe 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-11 17:50:51 +01:00
Michael Niedermayer
650fd9c004 avformat/avr: check channels and bps in probe 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-11 14:51:43 +01:00
Michael Niedermayer
676bc505f7 avformat/utils: disabled debug code to collect format probing statistics 
This allows collecting statistics on probing scores and the amount of data
probing needed for various files and formats.
For example it can be used to find out which formats tend to need more
data for probing or which files are probed with less certain/lower scores

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-11 13:06:36 +01:00
Michael Niedermayer
2fbc759d08 avformat/diracdec: check 2 chunks in probe 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 16:06:16 +01:00
Michael Niedermayer
023953e964 avformat/astdec: increase the score for odd samplerate/channels to max/8 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 13:37:06 +01:00
Michael Niedermayer
eb96802355 avformat/rsd: increase the score for odd samplerate/channels to max/8 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 13:37:03 +01:00
Michael Niedermayer
ef28694d36 avformat/lvfdec: increase the score for odd channels to max/8 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 13:36:59 +01:00
Michael Niedermayer
9225ebd50d avformat/swfdec: return AVPROBE_SCORE_MAX / 4 for unexpected versions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 13:25:35 +01:00
Michael Niedermayer
b570835296 avformat/ape: check version in probe 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 13:25:35 +01:00
Michael Niedermayer
59ce62f713 avformat/dv: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 12:27:17 +01:00
Michael Niedermayer
52268def10 avformat/thp: check fps value during probing 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 02:04:08 +01:00
Michael Niedermayer
858ef56297 avformat/thp: do not set sample_rate for a video codec 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 02:04:08 +01:00
Erik Olofsson
f5bffd3a1a libavf/avienc: store language metadata for XSUB streams 
Formatted in such a way that DivX certified players can decode it.
Verified on Sony Playstation 3 and Philips DVP3380.

Fixes ticket 2385

Signed-off-by: Erik Olofsson <eaj.olofsson@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-09 20:33:04 +01:00
Michael Niedermayer
ef8f293472 avformat/dv: consider a header match at byte 0 to count as detection of dv in probe 
This reduces the amount of data needed to identify dv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-09 18:39:09 +01:00
Michael Niedermayer
e624df5dc3 mpegts: only calculate stat index when its needed during probe 
40% faster probe

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-09 16:09:26 +01:00
Michael Niedermayer
9825b99eca avformat/mpegts: do not hardcode type used in memset() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-09 16:03:41 +01:00
Michael Niedermayer
76a47d66c4 avformat/dv: about 3 times faster probe 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-09 14:46:14 +01:00
James Zern
eb7f7b797f riff: add VP9 fourcc 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-09 12:13:44 +01:00
Michael Niedermayer
64f4816915 avformat/mp3dec: 4x faster probing 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-09 01:45:24 +01:00
Michael Niedermayer
557571ff7d avformat/h261dec: dont accept invalid gobs in probe as valid 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-09 01:12:10 +01:00
Michael Niedermayer
891f33cc70 avformat/h261dec: optimize probe 
about 3 times faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-09 00:45:35 +01:00
Michael Niedermayer
c79c7ffc9d Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avienc: drop the vfr flag.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-09 00:18:50 +01:00
Michael Niedermayer
a26e83da6c avformat/mxfdec: optimize probing 
about 71 times faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-08 22:33:52 +01:00
Anton Khirnov
d42db44cfe avienc: drop the vfr flag. 
AVI does not really support vfr properly, only by padding with null
packets.
 2013-11-08 21:02:29 +01:00
Michael Niedermayer
4f0e85517f avformat/icodec: reduce score returned on probing 
The ico probe function is pretty weak just checking a few bytes for being 0, 1 or not 0

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-08 20:10:33 +01:00
Michael Niedermayer
f8a9cf7704 avformat/lvfdec: check stream count during probing 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-08 17:03:42 +01:00
Michael Niedermayer
4c439f6e39 avformat/idcin: check the decompressed frame size during probing 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-08 15:19:35 +01:00