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

44821 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek Buitenhuis
b62d4c16c9 Revert "cbrt_tablegen: Include libm.h" 
This code runs on the host and should not use libm.h, which is meant
for the target.

This reverts commit 2768b71798.
 2012-09-25 12:54:26 -04:00
Michael Niedermayer
49331f7ba3 dnxhdenc: fix speed regression 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-25 18:10:11 +02:00
Michael Niedermayer
6b33e91899 mpegvideo: factorize ff_dct_encode_init() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-25 18:10:11 +02:00
Michael Niedermayer
71d6eb2208 dnxhdenc: remove redundant call to ff_dsputil_init() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-25 18:10:11 +02:00
Michael Niedermayer
8deddc6961 avcodec_alloc_frame: dont zero the whole struct twice 
cleaning it up is already done in avcodec_get_frame_defaults()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-25 18:10:10 +02:00
Michael Niedermayer
d9d56712e9 oggparsetheora: print error when failing on unknown header 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-25 17:32:11 +02:00
Michael Niedermayer
abcaacf1ac Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  pthread: make sure AVFrame.extended_data is set properly.
  libfdk-aac: reindent after last commit
  libfdk-aac: Limit to supported sample rates.
  cbrt_tablegen: Include libm.h
  oggparsetheora: make it more robust
  ogg: prevent NULL pointer deference in theora gptopts

Conflicts:
	libavformat/oggparsetheora.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-25 16:11:34 +02:00
Michael Niedermayer
d3ef2da59d oggdec: add missing () for OGG_NOGRANULE_VALUE 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-25 16:03:55 +02:00
Michael Niedermayer
0842e32f99 Merge commit 'd1f05dd18375f2f8e68372edee11436927e43ba8' 
* commit 'd1f05dd18375f2f8e68372edee11436927e43ba8':
  ogg: calculate the start position once all the headers are parsed

Conflicts:
	libavformat/oggdec.c
	libavformat/oggparseskeleton.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-25 16:00:09 +02:00
Michael Niedermayer
4c273eb64c oggdec: print a warning if the number of headers mismatch expectations. 
This is based on:
	commit 7751e4693d
	Author: Luca Barbato <lu_zero@gentoo.org>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-25 15:34:58 +02:00
Michael Niedermayer
cc4deafed1 oggdec: print error when headers couldnt be parses successfully 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-25 15:22:05 +02:00
Michael Niedermayer
46a35959d8 Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 
* commit '7751e4693dd10ec98c20fbd9887233b575034272':
  ogg: check that the expected number of headers had been parsed
  libx264: change default to closed gop to match x264cli
  Use avcodec_free_frame() to free AVFrames.
  lavf: use a malloced AVFrame in try_decode_frame().
  lavc: add avcodec_free_frame().
  lavc: ensure extended_data is set properly on decoding
  lavc: initialize AVFrame.extended_data in avcodec_get_frame_defaults()
  lavc: use av_mallocz to allocate AVFrames.
  lavc: rename the argument of avcodec_alloc_frame/get_frame_defaults

Conflicts:
	doc/APIchanges
	doc/examples/decoding_encoding.c
	libavcodec/utils.c
	libavcodec/version.h
	libavfilter/src_movie.c
	libavformat/oggdec.c
	libavformat/oggdec.h
	libavformat/oggparsetheora.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-25 15:15:16 +02:00
Anton Khirnov
7a1a9dd56c pthread: make sure AVFrame.extended_data is set properly. 
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2012-09-25 12:03:23 +02:00
Stefano Sabatini
2089f93300 ffprobe: drop pointless opaque parameter in writer init callback 
The parameter was never used.
 2012-09-25 11:02:52 +02:00
Stefano Sabatini
58e9025993 ffprobe: reindent after previous commit 2012-09-25 09:22:00 +02:00
Stefano Sabatini
4b370d6126 ffprobe: rework checking logic in writer_print_time() and writer_print_rational() 
Make writer_print_time() and writer_print_rational() always call
writer_print_int() or writer_print_string(). This way the checks for
determining if the value should be printed or not are consistently
performed in the low level functions.

writer_print_rational() is moved downward in order to avoid a forward
reference.

Simplify/amend the overall logic.
 2012-09-25 09:20:57 +02:00
Clément Bœsch
4390f8c28d Fix two "skiping" typo. 2012-09-25 07:42:32 +02:00
Nathan Caldwell
c8ba8be27e libfdk-aac: reindent after last commit 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-09-25 08:08:05 +03:00
Nathan Caldwell
94a69dee64 libfdk-aac: Limit to supported sample rates. 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-09-25 08:08:05 +03:00
Derek Buitenhuis
2768b71798 cbrt_tablegen: Include libm.h 
Needed for cbrtf fallback on systems which lack it.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-09-24 22:47:47 -04:00
Michael Niedermayer
aea15df3b4 ffv1dec: change bitstream end check to a exact check instead of a +-1 check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-25 03:43:23 +02:00
Michael Niedermayer
d8676140de ffv1: inject sentinels for RC->VLC transitions begining with 1.3 
This breaks bitstream compatibility of 1.3 VLC streams
This fixes very rare errors in the RC stream at the transition point
to VLC.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-25 03:43:22 +02:00
Michael Niedermayer
ad9371ef24 ffv1enc: fix RC slice sentinel 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-25 03:43:21 +02:00
Michael Niedermayer
6bcbe768bb lavf: dont add apic streams for demuxers that dont support it. 
Fixes crash
Fixes ticket1730

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-25 02:47:09 +02:00
Alexander Strasser
dde8068856 ffprobe: Consider the chosen separator when doing CSV escaping 
Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
 2012-09-25 01:32:34 +02:00
Alexander Strasser
dd83028374 ffprobe: Rename variable in csv_escape_str() 
Sync to 3245be9 .

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
 2012-09-25 01:32:19 +02:00
Alexander Strasser
f70122dd57 ffprobe: Simplify CSV field quoting code 
Sync with bac1b31 .

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
 2012-09-25 01:32:13 +02:00
Mans Rullgard
7e3208a087 ARM: libswresample: NEON optimised generic fltp to s16 conversion 
Adapted to swr by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-24 23:19:32 +02:00
Michael Niedermayer
97599f8c6d swr: make sure the last data element is NULL so we can use it to detect the number of channels 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-24 23:19:32 +02:00
Mans Rullgard
5dc7363446 ARM: libswresample: NEON optimised stereo fltp to s16 conversion 
Adaption to swr by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-24 23:16:14 +02:00
Mans Rullgard
0eebde07a9 ARM: libswresample: NEON optimised flat float to s16 conversion 
Adapted to swr by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-24 23:16:14 +02:00
Luca Barbato
d1f05dd183 ogg: calculate the start position once all the headers are parsed 
The fisbone packets can be muxed in any order as long the last one
comes before the first data packet.
 2012-09-24 22:35:29 +02:00
Luca Barbato
7751e4693d ogg: check that the expected number of headers had been parsed 
Not having the header for a codec is a tell-tale of a broken file.
 2012-09-24 22:35:29 +02:00
Luca Barbato
0336dea2ef oggparsetheora: make it more robust 2012-09-24 22:35:29 +02:00
Michael Niedermayer
bb146bb57b ogg: prevent NULL pointer deference in theora gptopts 
Additional safety in case a special ogg stream is crafted
with the proper number of

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-24 22:35:29 +02:00
Stefano Sabatini
bbe9fe469a lavf/utils: remove loop on AVERROR(EAGAIN) in av_read_frame() 
The loop was introduced in 64d340c62a, and
was likely breaking non blocking reads as it busy loops.
 2012-09-24 21:16:48 +02:00
John Van Sickle
a716006a7d libx264: change default to closed gop to match x264cli 
open-gop can be enabled with "-flags -cgop"

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-09-24 19:23:03 +02:00
Michael Niedermayer
fd63c2ff0c fate: fix --disable-ffprobe 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-24 18:20:57 +02:00
Stefano Sabatini
f3bd6fa7a8 lavc/mmvideo: forward reget_buffer return value in mm_decode_frame() 2012-09-24 14:57:49 +02:00
Michael Niedermayer
ff584803b7 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtp: Packetization of JPEG (RFC 2435)
  smoothstreamingenc: Copy the SAR on the AVStreams as well

Conflicts:
	Changelog
	libavformat/rtpenc.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-24 13:54:24 +02:00
Michael Niedermayer
874b9dcc4b ppc/cpu: make linux 32bit specific altivec detection depend on __linux__ 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-24 13:41:48 +02:00
Michael Niedermayer
c75b611a38 configure: enable runtime cpu detect by default. 
with the exception of libpostproc runtime_cpudetect = no is not
supported thus having no as default really is quite odd, it results in
a libpostproc where HAVE_MMX* have very different meaning from the
rest of ffmpeg and it breaks any x86 cpu that doesnt support mmx2
because mmx2 is hardcoded as a result

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-24 13:17:29 +02:00
Anton Khirnov
11d1ca4b2c Use avcodec_free_frame() to free AVFrames. 2012-09-24 12:31:25 +02:00
Anton Khirnov
9eb296572e lavf: use a malloced AVFrame in try_decode_frame(). 
This allows using avcodec_free_frame() to free it properly.
 2012-09-24 12:31:24 +02:00
Anton Khirnov
a42aadabc6 lavc: add avcodec_free_frame(). 
Since an AVFrame now has malloced members (extended_data), it must have
a destructor.
 2012-09-24 12:31:24 +02:00
Anton Khirnov
b437cec143 lavc: ensure extended_data is set properly on decoding 2012-09-24 12:31:24 +02:00
Anton Khirnov
2bc0de3858 lavc: initialize AVFrame.extended_data in avcodec_get_frame_defaults() 2012-09-24 12:31:24 +02:00
Anton Khirnov
c084a975aa lavc: use av_mallocz to allocate AVFrames. 
Otherwise the frame is uninitialized, so avcodec_get_frame_defaults()
cannot determine whether to free extended_data.
 2012-09-24 12:31:24 +02:00
Anton Khirnov
a83499b13b lavc: rename the argument of avcodec_alloc_frame/get_frame_defaults 
AVFrame is used for both audio and video, so calling the argument 'pic'
is misleading.
 2012-09-24 12:31:24 +02:00
Stefano Sabatini
efa3d5af1e lavc/roqvideodec: fix error message 
Remove redundant reference to codec name, it is already mentioned in the
log header.
 2012-09-24 12:02:38 +02:00