generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
40,033 Commits 24 Branches 241 Tags 173 MiB
2f06b56382
Commit Graph

18886 Commits

Author SHA1 Message Date
Ronald S. Bultje
95bfa4ead7 h264: reindent get_cabac_bypass_sign_x86(). 2012-03-28 08:01:29 -07:00
Ronald S. Bultje
db025929f2 h264: use struct offsets in get_cabac_bypass_sign_x86(). 2012-03-28 08:01:29 -07:00
Ronald S. Bultje
7374fac804 h264: fix overreads in cabac reader. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-28 08:01:28 -07:00
Ronald S. Bultje
d360dd902c wmall: fix seeking. 2012-03-28 07:14:21 -07:00
Ronald S. Bultje
0a82f5275f lagarith: fix buffer overreads. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-28 07:06:47 -07:00
Diego Biurrun
c0b34e6148 dvdec: drop unnecessary dv_tablegen.h #include 
dvdec.c uses nothing from dv_tablegen.h.  As a welcome side-effect, this
fixes compilation of that file with hardcoded tables enabled.
 2012-03-28 15:51:43 +02:00
Michael Niedermayer
c44417e15a indeo4: Dont leave tables in random state on errors. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 14:53:17 +02:00
Michael Niedermayer
a74d721876 indeo4: apply correction to eob/esc indexes too 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 14:52:27 +02:00
Michael Niedermayer
92f7f1db42 indeo4: Check for mismatching scan tables 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 14:51:21 +02:00
Michael Niedermayer
a60a4d7041 vc1dec: Fix global array overread. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 10:44:43 +02:00
Michael Niedermayer
8db2935db0 apedec: fix global array overread 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 10:30:44 +02:00
Diego Biurrun
a92be9b856 Replace memset(0) by zero initializations. 
Also remove one pointless zero initialization in rangecoder.c.
 2012-03-28 09:38:33 +02:00
Diego Biurrun
856c8e0a04 faandct: Remove FAAN_POSTSCALE define and related code. 
It is not a user-accessible option and unlikely to ever be changed.
 2012-03-28 09:38:31 +02:00
Anton Khirnov
a839dbb94e dvenc: print allowed profiles if the video doesn't conform to any of them. 2012-03-28 09:29:04 +02:00
Anton Khirnov
3c6607eb6f avcodec_encode_{audio,video}: only reallocate output packet when it has non-zero size. 
Otherwise realloc would free it, which would result in double free
later.
 2012-03-28 09:28:47 +02:00
Michael Niedermayer
7a5e587249 apedec: check bits <= 32 
Fixes FPE

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 08:24:31 +02:00
Michael Niedermayer
936951ca5c tm2dec: check total_frames and extradata_size. 
Fixes overread

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 08:24:31 +02:00
Carl Eugen Hoyos
b17b296369 Fix compilation with hardcoded tables. 2012-03-28 08:06:38 +02:00
Michael Niedermayer
d0dafebb75 tm2: Fix overread of token array. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 07:37:12 +02:00
Michael Niedermayer
11cc209226 lzw(gif): Fix overread 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 07:36:56 +02:00
Michael Niedermayer
96d0494123 lagarith: Fix various issues that lead to out of array reads. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 06:41:40 +02:00
Michael Niedermayer
44bd50f529 lagarith: fix flipped return value 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 06:40:14 +02:00
Michael Niedermayer
c30d04cedd lagarithrac: fix length used in ff_lag_rac_init() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 06:26:54 +02:00
Michael Niedermayer
7b453d1c60 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  westwood_vqa: fix SND0 chunk handling
  westwood_vqa: set video stream duration
  raw: forward avpicture_fill() error code in raw_decode().
  build: Do not explicitly add the doc directory to the OBJDIRS list.
  dv: Split off DV video decoder into its own file.
  build: fix RALF decoder standalone compilation, which depends on Golomb code
  configure: Drop stray duplicate entry for --disable-fft from help output.

Conflicts:
	libavcodec/dv.c
	libavcodec/rawdec.c
	libavformat/westwood_vqa.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 04:12:24 +02:00
Michael Niedermayer
4a619fcae9 h263dec: Restore w/h values to a consistent state if a change is rejected. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 03:17:48 +02:00
Paul B Mahol
e4cc9f309e Support FLIC in AVI. 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-28 02:34:06 +02:00
Paul B Mahol
a0340dfbd7 XBM decoder 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 20:08:41 +02:00
Paul B Mahol
1cd8510912 j2kdec: move ff_j2k_init_tier1_luts() to j2kdec_init() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 19:51:19 +02:00
Thilo Borgmann
7ea948bac3 alsdec: check return values. 2012-03-27 18:06:54 +02:00
Paul B Mahol
55abaa58e5 westwood_vqa: fix SND0 chunk handling 
Version from vqa header does not dictate which sound chunks may
appear in file.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-03-27 11:58:15 -04:00
Ronald S. Bultje
98df2e2414 raw: forward avpicture_fill() error code in raw_decode(). 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-27 08:54:07 -07:00
Michael Niedermayer
28a613b09b h264: dont mess with chroma planes for grayscale h264. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 15:28:18 +02:00
Michael Niedermayer
dfacef9e73 alsdec: make sure no invalid opt_order stays in the context. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 13:50:41 +02:00
Michael Niedermayer
1acc553e54 vc1dec: dont ignore ff_vc1_parse_frame_header_advs return value 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 13:22:28 +02:00
Michael Niedermayer
e3bd61248f vc1dec: avoid == -1 checks for errors. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 13:21:28 +02:00
Michael Niedermayer
b378a23395 vc1dec: sanity check state used in get_mvdata_interlaced() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 13:20:51 +02:00
Michael Niedermayer
6999f8bcf5 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  make av_interleaved_write_frame() flush packets when pkt is NULL
  mpegts: Fix dead error checks
  vc1: Do not read from array if index is invalid.
  targa: convert to bytestream2.
  rv34: set mb_num_left to 0 after finishing a frame

Conflicts:
	libavcodec/targa.c
	libavcodec/vc1data.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 11:59:39 +02:00
Diego Biurrun
d724fe665b dv: Split off DV video decoder into its own file. 2012-03-27 11:15:47 +02:00
Paul B Mahol
0f3886fa7d j2kdec: remove pointless swapping 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 03:32:07 +02:00
Paul B Mahol
ebbf10efb0 j2kdec: vertically align AVCodec members 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 03:29:54 +02:00
Paul B Mahol
75625c6138 j2kdec: Remove useless .pix_fmts. 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 03:29:25 +02:00
Paul B Mahol
ddfa3751c0 j2kdec: convert to bytestream2 API 
Protects against overreads.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 03:27:13 +02:00
Mashiat Sarker Shakkhar
95b192de5d vc1: Do not read from array if index is invalid. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-03-26 17:48:13 -07:00
Ronald S. Bultje
2ad405548b targa: convert to bytestream2. 
Also remove some write-only variables or write-only variable
assignments, remove internal colorspace conversion to native
endianness (that can be done by swscale much more efficiently),
and some cosmetics.
 2012-03-26 17:46:16 -07:00
Michael Niedermayer
8b58f6b5c2 Revert "raw: move buffer size check up." 
This reverts commit cc5dd632ce.
The change was redundant, it has been fixed long ago (422e3a7)

Conflicts:

	libavcodec/rawdec.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 02:17:54 +02:00
Ronald S. Bultje
5484170ac7 rv34: set mb_num_left to 0 after finishing a frame 
Prevents running error resilience on a previous frame which will write
to the pic->mb_type[] array of the previous image. The array might
already be re-used for a new image in a subsequent thread, thus cause
two threads to write to the same pic->mb_type[] array, causing a race
condition which can crash in rv34_decode_cbp(), called by
rv34_decode_inter_mb_header() (which accesses mb_type[] twice,
assuming values are maintained, which the race condition breaks).

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-26 16:39:01 -07:00
Paul B Mahol
7f9b42ff9d j2kenc: cosmetics: vertically align AVCodec members. 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 00:49:27 +02:00
Paul B Mahol
a65016205f libopenjpegdec: hack to fix GRAY16 decoding 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 00:48:27 +02:00
Michael Niedermayer
d6eef545c1 vc1dec: move mquant zero check down. 
This way it catches all cases, and prevents later segfaults.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 00:45:32 +02:00
Michael Niedermayer
43fd321252 targa: Fix input buffer size check. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-27 00:45:32 +02:00
Clément Bœsch
29679f4a37 aac: reference supported sample rates in encoders. 2012-03-26 22:46:40 +02:00
Michael Niedermayer
a84851bef8 indeo3dec: check mv bitstream pointer 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 22:22:51 +02:00
Michael Niedermayer
8a521d57b3 indeo3dec: Fix end pointer. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 22:11:29 +02:00
Michael Niedermayer
7e496e1545 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  build: ppc: drop stray leftover backslash
  build: Only clean the architecture subdirectory we build for.
  build: drop some unnecessary dependencies from the H.264 parser
  build: prettyprinting cosmetics
  libavutil: Remove pointless rational test program.
  libavutil: Remove broken and pointless lzo test program.
  lavf doxy: expand AVStream.codec doxy.
  lavf doxy: improve AVStream.time_base doxy.
  lavf doxy: add some basic documentation about reading from the demuxer.
  lavf doxy: document passing options to demuxers.
  lavf doxy: clarify that an AVPacket contains encoded data.
  mpegtsenc: allow user triggered PES packet flushing
  APIchanges: mark the place where 0.7 was cut.
  APIchanges: mark the place where 0.8 was cut.
  APIchanges: fill in missing dates and hashes.
  smacker: convert palette and header reading to bytestream2.
  alac: convert extradata reading to bytestream2.

Conflicts:
	doc/APIchanges
	libavcodec/smacker.c
	libavcodec/x86/Makefile
	libavfilter/Makefile
	libavutil/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 20:52:52 +02:00
Reimar Döffinger
fca62f0500 Support FLIC in MOV. 
Fixes trac issue #626.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-03-26 20:03:56 +02:00
Diego Biurrun
72ccfb3cb7 build: ppc: drop stray leftover backslash 2012-03-26 16:37:57 +02:00
Thilo Borgmann
5afd9a80db als: consistent messages 
"." for warnings, "!" for errors.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 16:21:21 +02:00
Paul B Mahol
3f26a87488 libopenjpegenc: remove leftover because older version of patch being applied 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 16:20:14 +02:00
Thilo Borgmann
04dc7e7e5e ALS error message pretty print 
One prettier message.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 16:16:57 +02:00
Michael Niedermayer
cece491daa qdm2: Fix out of array writes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 15:29:14 +02:00
Michael Niedermayer
fe91becc2d qdm2: fix out of array read 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 15:26:14 +02:00
Michael Niedermayer
7d74aaf698 qdm2dec: fix out of array read 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 15:16:47 +02:00
Diego Biurrun
e7e19b15c7 build: Only clean the architecture subdirectory we build for. 
This allows simplifying the Makefiles; it is no longer necessary to register
arch subdirectory Makefiles, just putting them in place is enough.
 2012-03-26 13:29:03 +02:00
Diego Biurrun
ad0e31f134 build: prettyprinting cosmetics 2012-03-26 13:00:10 +02:00
Paul B Mahol
3dc0b9d6da libopenjpegdec: refactor some code and fix memory leaks 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 05:04:59 +02:00
Paul B Mahol
02fb320ada libopenjpegdec: always check image because decoding may still fail 
Fixes bunch of segfaults.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 05:01:57 +02:00
Paul B Mahol
67d5fcc989 libopenjpegenc: allow changing encoding parameters 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 05:00:06 +02:00
Paul B Mahol
dec8eb6b29 libopenjpegenc: merge common code 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 04:59:43 +02:00
Paul B Mahol
8e45005a84 libopenjpegenc: use pix_fmt descriptor to get bpp 
This will also simplify adding support for RGB565 and similar.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 04:59:18 +02:00
Paul B Mahol
06b0c6a655 libopenjpegenc: use pix_fmt descriptor to get numcomps 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 04:58:44 +02:00
Michael Niedermayer
140c54ea0b indeo4: better mv check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 03:46:06 +02:00
Michael Niedermayer
c855ece101 indeo5: check motion vectors. 
fixes out of frame reading

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 03:45:45 +02:00
Ronald S. Bultje
b2af057a36 smacker: convert palette and header reading to bytestream2. 2012-03-25 16:31:16 -07:00
Paul B Mahol
25b67dc765 png: fix warning about discarding qualifiers [-Wincompatible-pointer-types] 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 01:02:11 +02:00
Aaron Colwell
aa9c2e41b6 pthread : Remove lock/unlock pairs in worker loop to avoid unexpected state changes. 
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-26 00:09:50 +02:00
Michael Niedermayer
9621646eb3 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: dsputil: prettyprint gcc inline asm
  x86: K&R prettyprinting cosmetics for dsputil_mmx.c
  x86: conditionally compile H.264 QPEL optimizations
  dsputil_mmx: Surround QPEL macros by "do { } while (0);" blocks.
  Ignore generated files below doc/.
  dpcm: convert to bytestream2.
  interplayvideo: convert to bytestream2.
  movenc: Merge if statements
  h264: fix memleak in error path.
  pthread: Immediately release all frames in ff_thread_flush()
  h264: Add check for invalid chroma_format_idc
  utvideo: port header reading to bytestream2.

Conflicts:
	.gitignore
	configure
	libavcodec/h264_ps.c
	libavcodec/interplayvideo.c
	libavcodec/pthread.c
	libavcodec/x86/dsputil_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-25 23:10:30 +02:00
Ronald S. Bultje
c3bbd0b53b alac: convert extradata reading to bytestream2. 2012-03-25 13:35:05 -07:00
Philip Langdale
1318b14379 CrystalHD: Remove EXPERIMENTAL flag for known good formats. 
With the flag in place, it's hard to actually use the decoder, and
I'm happy with how it works, with the exception of DivX3 where I've
never found a sample that worked that I was confident actually
matched what the hardware claimed to support.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-25 12:22:06 +02:00
Marton Balint
5420523ae3 pthread: return proper error code on pthread_create failure 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-25 12:22:06 +02:00
Reimar Döffinger
6d797ac70f VC1: Do not needlessly use signed types. 
This might even have prevented the compiler from some optimizations,
since both signed and unsigned types are used for the dezigzag tables/
table pointers, and if a branches uses both the compiler needs to
create more complex code.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-03-25 12:24:15 +02:00
Reimar Döffinger
31ff2cb266 DV: detect another case of broken DV files. 
See trac issue #217.
Only the dsf field seems to be used to distinguish between PAL and NTSC.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-03-25 12:23:44 +02:00
Reimar Döffinger
feda266db5 DV: check coded_width/height instead of width/height. 
This makes the workaround also work with lowres.
Fixes issue #633.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-03-25 12:23:44 +02:00
Reimar Döffinger
535eed9301 vqavideo: fix decoding of samples with no partial updates. 
Fixes playback of
http://samples.mplayerhq.hu/game-formats/vqa/landsoflore/B0EB8711.VQA
(trac issue #710).

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-03-25 12:23:44 +02:00
Diego Biurrun
62ce9defb8 x86: dsputil: prettyprint gcc inline asm 2012-03-25 11:50:48 +02:00
Diego Biurrun
3b54912113 x86: K&R prettyprinting cosmetics for dsputil_mmx.c 2012-03-25 11:50:48 +02:00
Diego Biurrun
915a2a0a65 x86: conditionally compile H.264 QPEL optimizations 2012-03-25 11:50:45 +02:00
Diego Biurrun
3816642eab dsputil_mmx: Surround QPEL macros by "do { } while (0);" blocks. 
This makes them safe to use in non-fully braced if-blocks and similar.
 2012-03-25 11:48:37 +02:00
Ronald S. Bultje
3a3f06b05e dpcm: convert to bytestream2. 2012-03-24 19:02:26 -07:00
Michael Niedermayer
8bf95e8bd5 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avc: Add a function for converting mp4 style extradata to annex b
  pthread: free progress if buffer allocation failed.
  lavc/avconv: support changing frame sizes in codecs with frame mt.
  libavformat: Document who sets the AVStream.id field
  utvideo: mark output picture as keyframe.
  sunrast: Add support for negative linesize.
  vp8: fix update_lf_deltas in libavcodec/vp8.c
  ralf: read Huffman code lengths without GetBitContext

Conflicts:
	ffmpeg.c
	libavcodec/sunrastenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-25 01:56:53 +01:00
Ronald S. Bultje
f31a68e78c interplayvideo: convert to bytestream2. 2012-03-24 17:09:18 -07:00
Paul B Mahol
bcae7f432a libaacplus: switch to encode2() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-24 23:35:09 +01:00
Alexander Strange
cb34867780 h264: fix memleak in error path. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-03-24 15:34:33 -07:00
Alexander Strange
147ee4cf06 pthread: Immediately release all frames in ff_thread_flush() 
Before this, they were only added to the delayed release queue and not
freed until later. This could lead to unnecessary memory use or buffer
exhaustion.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-03-24 15:29:51 -07:00
Alexander Strange
6ef4063957 h264: Add check for invalid chroma_format_idc 
Fixes a crash when FF_DEBUG_PICT_INFO is used.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-03-24 15:29:38 -07:00
Ronald S. Bultje
ec0ed97b04 utvideo: port header reading to bytestream2. 
Fixes crash during slice size reading if slice_end goes negative.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-24 15:15:56 -07:00
Ronald S. Bultje
2ee01fbded pthread: free progress if buffer allocation failed. 
Else we run out of progress variables after a few failed buffer
allocations.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-03-24 21:29:35 +01:00
Ronald S. Bultje
bc1ef85520 lavc/avconv: support changing frame sizes in codecs with frame mt. 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2012-03-24 21:29:16 +01:00
Kostya Shishkov
72dadaa957 utvideo: mark output picture as keyframe. 
Spotted by Антон.
 2012-03-24 20:21:33 +01:00
Paul B Mahol
f8ba7c4658 adxenc: fix error in merging from qatar 
Pointed out by FATE.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-24 17:52:53 +01:00
Paul B Mahol
7ed9abf793 sonic: mark as experimental 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-24 17:48:03 +01:00
Michael Niedermayer
229e4c1332 indeo5dec: Make sure we have had a valid gop header. 
This prevents decoding happening on a half initialized context.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-24 17:43:55 +01:00
Michael Niedermayer
9879b506b0 truemotion2dec: Fix overread of input. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-24 17:42:14 +01:00
Michael Niedermayer
71e78e1f51 cavsdec: check stc in decode_slice_header() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-24 16:29:46 +01:00
Aneesh Dogra
cc965300cb sunrast: Add support for negative linesize. 
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2012-03-24 11:27:20 -04:00
Michael Niedermayer
9a57a37b70 h264: move resolution change check further up. 
This prevents some variables from being changed in case of a
rejected resolution change.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-24 16:23:40 +01:00
Janne Salonen
14ba7472dc vp8: fix update_lf_deltas in libavcodec/vp8.c 
lf_delta.ref[i] and lf_delta.mode[i] were incorrectly reset to 0 if
specific delta value was not updated. Fixed to keep the previous value
if flag indicates that element in question is not updated.

Signed-off-by: Janne Salonen <jsalonen@google.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-03-24 08:22:05 -07:00
Michael Niedermayer
9d3032b960 alsdec: check opt_order. 
Fixes out of array write in quant_cof

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-24 14:54:12 +01:00
Michael Niedermayer
2c0559d5e2 mpegvideo: increase buffer sizes. 
Fixes buffer overflow

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-24 14:54:12 +01:00
Michael Niedermayer
8a20774a24 indeo4: Fix global array overread. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-24 14:54:11 +01:00
Carl Eugen Hoyos
5cddfc58d8 Fix linking without yasm. 2012-03-24 14:54:06 +01:00
Kostya Shishkov
494bce6224 ralf: read Huffman code lengths without GetBitContext 
Those descriptions are stored in nibbles, so they are easy to extract.
And this way we don't need to pad tables for possible bit reader overreads.
 2012-03-24 11:53:26 +01:00
Michael Niedermayer
f58f75dd92 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rv34: error out on size changes with frame threading
  aacsbr: Add a debug check to sbr_mapping.
  aac: Reset some state variables when turning SBR off
  aac: Reset PS parameters on header decode failure.
  fate: add wmalossless test.
  aacsbr: handle m_max values smaller than 4.

Conflicts:
	libavcodec/aacsbr.c
	tests/fate/lossless-audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-24 10:59:43 +01:00
Paul B Mahol
b222c28ee8 libopenjpegenc: switch to encode2() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-24 05:47:11 +01:00
Paul B Mahol
a5b823368a libopenjpeg: make .long_name usefull 
Fixes following strange output:

DEV D  libopenjpeg     OpenJPEG based JPEG 2000 encoder

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Michael Bradshaw <mbradshaw@sorensonmedia.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-24 05:45:57 +01:00
Paul B Mahol
68a257e673 bintext: build decoders only if they are actually enabled 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-24 05:44:37 +01:00
Michael Niedermayer
d85b3c4fff vp56dec: avoid freeing the returned frame before returning it. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-24 05:21:39 +01:00
Michael Niedermayer
25715064c2 cavsdec: check for changing w/h. 
Our decoder does not support changing w/h.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-24 03:26:52 +01:00
Michael Niedermayer
ba775a54bc indeo3: fix out of picture write. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-24 03:26:51 +01:00
Michael Niedermayer
59a4b73531 pthread/mpegvideo: detect and block attempts to init frames after setup. 
This fixes race conditions that ultimately lead to memory corruption.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-24 00:32:18 +01:00
Janne Grunau
cb7190cd2c rv34: error out on size changes with frame threading 2012-03-23 23:11:55 +01:00
Alex Converse
b00307ecd0 aacsbr: Add a debug check to sbr_mapping. 
There have been multiple bugs caused by inconsistencies here.

Based on an idea from Michael Niedermayer.

CC: libav-stable@libav.org
 2012-03-23 14:56:44 -07:00
Alex Converse
0cb93dacee aac: Reset some state variables when turning SBR off 
This makes sure the reset flag gets set when SBR gets turned back on
and sets control variables for unguided mode back to their defaults.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-23 14:56:44 -07:00
Alex Converse
a237b38021 aac: Reset PS parameters on header decode failure. 
If the next header frame codes zero envelopes the previous frame's
values will be used. Consequently the invalid values must be cleared.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-23 14:56:44 -07:00
Michael Niedermayer
71c2a70cbf error_concealment: Prevent FPEs in case of corrupted input. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-23 22:03:32 +01:00
Michael Niedermayer
e2d110d8d2 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rv34: Handle only complete frames in frame-mt.
  MPV: set reference frame pointers to NULL when allocation of dummy pictures fails
  configure: die if x11grab dependencies are unavailable
  zerocodec: factorize loop
  avconv: fix the resampling safety factors for output audio buffer allocation
  avconv: move audio output buffer allocation to a separate function
  avconv: make the async buffer global and free it in exit_program()

Conflicts:
	ffmpeg.c
	libavcodec/mpegvideo.c
	libavcodec/rv34.c
	libavcodec/zerocodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-23 21:20:06 +01:00
Ronald S. Bultje
71ea26811c aacsbr: handle m_max values smaller than 4. 
Prevents a signflip in the counter, and a subsequent crash because of
overreads/overwrites.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-23 12:56:08 -07:00
Reimar Döffinger
adb98a3d22 VC1: restore optimizations broken in 9a1ced32. 
They were moved into code under HAVE_YASM and most of them
even into completely disabled code with no reason given
for that in the commit message.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-03-23 19:39:02 +01:00
Paul B Mahol
e730036fdc interplayvideo: give avctx to av_dlog() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-23 19:12:34 +01:00
Paul B Mahol
0c57f8197c interplayvideo: remove superfluous strings from av_log() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-23 19:11:08 +01:00
Paul B Mahol
a0b07b8fc5 vmdvideo: remove superfluous strings from av_log messages 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-23 19:05:12 +01:00
Paul B Mahol
89cd95b19c sonic: fix warning about incompatible pointer types 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-23 19:03:45 +01:00
Janne Grunau
73ad4471a4 rv34: Handle only complete frames in frame-mt. 
Correct handling of errors to prevent hags or crashes is very complex
otherwise.

The frame initializing is also moved from decode_slice() to
decode_frame() for clarity.
 2012-03-23 17:50:46 +01:00
Janne Grunau
5ab506a5c8 MPV: set reference frame pointers to NULL when allocation of dummy pictures fails 2012-03-23 17:50:46 +01:00
Michael Niedermayer
afa6129016 zerocodec: factorize loop 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2012-03-23 12:10:41 +01:00
Michael Niedermayer
2e909b3c77 bitstream: build_table, check table_nb_bits. 
Fixes null ptr deref.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-23 11:38:53 +01:00
Michael Niedermayer
aae44fb4cd indeo4: check ref_mb 
Fix NULL deref

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-23 11:03:53 +01:00
Michael Niedermayer
a22e64fd02 rawdec: Check w/h. 
Fixes FPE

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-23 10:48:18 +01:00
Michael Niedermayer
08c37a10e9 mjpegdec: check h/v_count. 
Fixes FPE

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-23 10:24:22 +01:00
Michael Niedermayer
46c7842994 ituh263dec: Implement enough of Annex O (scalability) to fix a FPE. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-23 10:14:30 +01:00
Michael Niedermayer
cc415956a4 error_conceal: fix FPE in guess_dc() with huge sizes. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-23 05:21:52 +01:00
Michael Niedermayer
c0a99eae29 indeo4: check band->scan 
Fixes null ptr exception

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-23 04:29:41 +01:00
Paul B Mahol
ae2c33b0c2 cosmetics: remove superfluous curly brackets 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-23 03:09:07 +01:00
Paul B Mahol
0e465c1a81 huffyuv: remove long time disabled code 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-23 03:09:07 +01:00
Paul B Mahol
3a085c6a37 huffyuv: do not decode/encode yuv colorspace with odd width 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-23 03:09:07 +01:00
Michael Niedermayer
ba02069a8e aacdec: prevent channels from exceeding MAX_CHANNELS. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-23 03:08:58 +01:00
Michael Niedermayer
7c0748c2db eatqi: replace break by goto. 
This fixes some heap overread.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-23 00:50:43 +01:00
Michael Niedermayer
5a4af049b1 aacdec: reset max_sfb on invalid data. 
Fixes global out of array read.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 23:57:45 +01:00
Michael Niedermayer
3583c8706d vqavideodev: Check image dimensions 
Fixes out of heap array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 23:43:37 +01:00
Michael Niedermayer
464cef4c14 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  xwma: Validate channels and bits_per_coded_sample.
  mov: Do not read past the end of the ctts_data table.
  mov: Add missing terminator to mov_ch_layout_map_1ch.
  asf: reset side data elements on packet copy.
  wmavoice: fix stack overread.
  wmalossless: error out if a subframe is not used by any channel.
  vqa: check palette chunk size before reading data.
  wmalossless: reset sample pointer for each subframe.
  wmalossless: error out on invalid values for order.

Conflicts:
	libavcodec/vqavideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 23:16:49 +01:00
Michael Niedermayer
9759d2b886 indeo4: check motion vetors. 
Fixes out of heap array read.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 23:13:00 +01:00
Michael Niedermayer
afc0cc22e1 pngenc: make max_packet_size 64bit check check it. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 23:13:00 +01:00
Clément Bœsch
50a3867bab png: make ff_png_pass_mask local to pngdec. 2012-03-22 22:53:51 +01:00
Carl Eugen Hoyos
abdcb4918c Fix libgsm.c compilation after typo in 67b8c8. 2012-03-22 22:01:35 +01:00
Michael Niedermayer
6716e6892b Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  FATE: Add ZeroCodec test
  oggparseogm: fix order of arguments of avpriv_set_pts_info().
  pngenc: better upper bound for encoded frame size.
  aiffdec: set block_duration to 1 for PCM codecs that are supported in AIFF-C
  aiffdec: factor out handling of integer PCM for AIFF-C and plain AIFF
  aiffdec: use av_get_audio_frame_duration() to set block_duration for AIFF-C
  aiffdec: do not set bit rate if block duration is unknown
  wmall: output packet only if we have decoded some samples

Conflicts:
	libavcodec/pngenc.c
	tests/fate/lossless-video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 20:59:58 +01:00
Paul B Mahol
b1a0d694ea dcaenc: switch to encode2() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 20:44:24 +01:00
Ronald S. Bultje
262196445c wmavoice: fix stack overread. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-22 12:17:14 -07:00
Ronald S. Bultje
3c9267673e wmalossless: error out if a subframe is not used by any channel. 
Prevents infinite loop because min_channel_len never increments.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-22 12:17:14 -07:00
Ronald S. Bultje
75d7975268 vqa: check palette chunk size before reading data. 
Prevents overreads beyond buffer boundaries.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-22 12:17:14 -07:00
Ronald S. Bultje
d462949974 wmalossless: reset sample pointer for each subframe. 
Prevents overwrites when some subframes only encode some channels.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-22 12:17:14 -07:00
Ronald S. Bultje
326f7a68bb wmalossless: error out on invalid values for order. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2012-03-22 12:17:14 -07:00
Anton Khirnov
677df4d2ef pngenc: better upper bound for encoded frame size. 
Fixes encoding very large pictures.

Thanks to Костя for providing the formula.
 2012-03-22 19:50:35 +01:00
Michael Niedermayer
179a592094 libutvideoenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:40:58 +01:00
Michael Niedermayer
532f1c7aa7 lavc: limit realloc() on encoding to the libav compatibility API. 
Neither the old nor new need it.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:40:58 +01:00
Reimar Döffinger
0f95270afe VC1: Fix skiploopfilter=all. 
It is currently only handled in the parser code for WMV/ASF style
header, but not the one used in the bytestream format used when
muxed into MPEG-TS as on e.g. BluRay.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-03-22 19:41:09 +01:00
ami_stuff
f6b7863808 Replace SSE2 instruction in scalarproduct_float_sse() by SSE equivalent. 
Fixes an AAC decoding issue with the sample from ticket #213 on machines
with SSE but without SSE2.
Based on 89411a by Reimar.
 2012-03-22 19:28:52 +01:00
Michael Niedermayer
740b9ff44e lavc: Redesign the internal encoding API. 
The new API allows (optionally and on by default) using a internal buffer to encode, avoiding
the need to allocate large buffers or risking failure on too small buffers.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:48 +01:00
Michael Niedermayer
dca0e4cd61 avcodec_encode_audio2: use ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:23 +01:00
Michael Niedermayer
2bd303f95c zmbvenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:23 +01:00
Michael Niedermayer
ae7f0d0a4f yuv4enc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:23 +01:00
Michael Niedermayer
7959eb0d12 y41penc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:22 +01:00
Michael Niedermayer
a3f36b09e7 xwdenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:22 +01:00
Michael Niedermayer
5d8a20a1c5 xbmenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:22 +01:00
Michael Niedermayer
6cb29a1ab0 wmaenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:22 +01:00
Michael Niedermayer
2ed79755d7 vorbisenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:22 +01:00
Michael Niedermayer
079d7246fb v410enc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:22 +01:00
Michael Niedermayer
efc245b9d6 v408enc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:22 +01:00
Michael Niedermayer
f234b02c94 v308enc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:22 +01:00
Michael Niedermayer
e252fb822a v210enc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:22 +01:00
Michael Niedermayer
219d8245a0 tiffenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:22 +01:00
Michael Niedermayer
ea8fc91886 tiffenc: fix return value. 2012-03-22 19:03:22 +01:00
Michael Niedermayer
c038fb411b targaenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:22 +01:00
Michael Niedermayer
dbb11e7db3 svq1enc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:22 +01:00
Michael Niedermayer
2ea893fa23 sunrastenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:22 +01:00
Michael Niedermayer
b911d7dc60 sgienc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:22 +01:00
Michael Niedermayer
c32438c42a r210enc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:21 +01:00
Michael Niedermayer
78365b414b qtrleenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:21 +01:00
Michael Niedermayer
37e434e492 proresenc_kostya: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:21 +01:00
Michael Niedermayer
d388dd9ee3 proresenc_anatoliy: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:21 +01:00
Michael Niedermayer
6a74c48cf9 pnmenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:21 +01:00
Michael Niedermayer
5c6c62543c pngenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:21 +01:00
Michael Niedermayer
d2c4b3754d pcxenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:21 +01:00
Michael Niedermayer
11e8f3e7a2 pcm: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:21 +01:00
Michael Niedermayer
29971e4f9c pamenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:21 +01:00
Michael Niedermayer
93aafe2a39 nellymoserenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:21 +01:00
Michael Niedermayer
6e3aee03b8 msvideo1enc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:21 +01:00
Michael Niedermayer
3998b13a34 mpegaudioenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:21 +01:00
Michael Niedermayer
a895669f53 ljpegenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:21 +01:00
Michael Niedermayer
fcd8a3c8c2 libxvidff: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:21 +01:00
Michael Niedermayer
d29719121d libxavs: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:20 +01:00
Michael Niedermayer
660e8cb9e3 libx264: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:20 +01:00
Michael Niedermayer
316defa93c libvpxenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:20 +01:00
Michael Niedermayer
9407cf137f libvorbis: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:20 +01:00
Michael Niedermayer
d9375b0ec6 libvo-amrwbenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:20 +01:00
Michael Niedermayer
b7b2821f84 libvo-aacenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:20 +01:00
Michael Niedermayer
b611ffc5d0 libtheoraenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:20 +01:00
Michael Niedermayer
f3b10d38d7 libspeexenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:20 +01:00
Michael Niedermayer
bb84112bae libschroedingerenc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:20 +01:00
Michael Niedermayer
83fc7341a7 libopencore-amr: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:20 +01:00
Michael Niedermayer
c7ef5a4aa9 libmp3lame: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:20 +01:00
Michael Niedermayer
67b8c88cfe libgsm: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:20 +01:00
Michael Niedermayer
1308b2df44 libfaac: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:20 +01:00
Michael Niedermayer
7d3ef3840b ac3enc: switch to ff_alloc_packet2(). 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:20 +01:00
Michael Niedermayer
55cc80dc29 a64multienc: switch to ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:20 +01:00
Michael Niedermayer
076310edee snowenc: switch to ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:19 +01:00
Michael Niedermayer
6eaa31cb9b roqaudioenc: switch to ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:19 +01:00
Michael Niedermayer
6c775606d1 roqvideoenc: switch to ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:19 +01:00
Michael Niedermayer
57c52663b6 rawenc: : switch to ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:19 +01:00
Michael Niedermayer
b7d4eebd3b ra144enc: switch to ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:19 +01:00
Michael Niedermayer
e22113cf1d mpegvideo_enc: : switch to ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:19 +01:00
Michael Niedermayer
620559e37b lclenc: switch to ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:19 +01:00
Michael Niedermayer
f8a67cb81f jpeglsenc: switch to ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:19 +01:00
Michael Niedermayer
35dfeb871c j2kenc: switch to ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:19 +01:00
Michael Niedermayer
e180079c1f huffyuvenc: switch to ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:19 +01:00
Michael Niedermayer
5dadfaa9f5 gifenc: switch to ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:19 +01:00
Michael Niedermayer
c5ea6a5c75 g726enc: switch to ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:19 +01:00
Michael Niedermayer
2e4413ce2c g722enc: switch to ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:19 +01:00
Michael Niedermayer
3f35b66512 flashv2enc: switch to ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:19 +01:00
Michael Niedermayer
8fb7b5f7c8 flashvenc: switch to ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:19 +01:00
Michael Niedermayer
487996f64a flacenc: switch to ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:18 +01:00
Michael Niedermayer
ed45636e16 ffv1enc: switch to ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:18 +01:00
Michael Niedermayer
8f80e5fbea dvenc: switch to ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:18 +01:00
Michael Niedermayer
aa9700c988 dpxenc: switch to ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:18 +01:00
Michael Niedermayer
9d44b0549f dnxhdenc: switch to ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:18 +01:00
Michael Niedermayer
ca6a3448e9 cljrenc: switch to ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:18 +01:00
Michael Niedermayer
f79b09b7af bmpenc: switch to ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:18 +01:00
Michael Niedermayer
a18cf3635c alacenc: switch to ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:18 +01:00
Michael Niedermayer
f360e7b47c sv1enc: switch to ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:18 +01:00
Michael Niedermayer
a42fa4c649 adxenc: switch to ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:18 +01:00
Michael Niedermayer
a8aba0684e adpcmenc: switch to ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:18 +01:00
Michael Niedermayer
7fe8250e9a aacenc: switch to ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:18 +01:00
Michael Niedermayer
00663de3b7 lavc: add ff_alloc_packet2(). 
This contains a AVCodecContext thus allowing us to prevent the
error message duplication

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:18 +01:00
Michael Niedermayer
6c9db40205 avcodec_encode_audio2: add missing padding to realloc() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 19:03:17 +01:00
Paul B Mahol
f1c69546c0 dvbsub: remove unused variable 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 13:41:48 +01:00
Paul B Mahol
8678af542c flicvideo: remove dead store 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 13:24:36 +01:00
Paul B Mahol
f2b91bd63a latm_parser: remove dead store 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 13:23:08 +01:00
Paul B Mahol
f5463d5347 sunrastenc: remove dead store 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 13:21:30 +01:00
Paul B Mahol
ddbd0cedb0 mjpegbdec: remove dead store 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 13:19:42 +01:00
Paul B Mahol
36440982a0 vqavideo: remove some superfluous " VQA video: " 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 13:16:24 +01:00
Kostya Shishkov
87818103a0 wmall: output packet only if we have decoded some samples 
Also set CODEC_CAP_DELAY to indicate that decoder may still have some
undecoded data left in internal buffer.
 2012-03-22 07:16:47 +01:00
Michael Niedermayer
967facb695 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (26 commits)
  adxenc: use AVCodec.encode2()
  adxenc: Use the AVFrame in ADXContext for coded_frame
  indeo4: fix out-of-bounds function call.
  configure: Restructure help output.
  configure: Internal-only components should not be command-line selectable.
  vorbisenc: use AVCodec.encode2()
  libvorbis: use AVCodec.encode2()
  libopencore-amrnbenc: use AVCodec.encode2()
  ra144enc: use AVCodec.encode2()
  nellymoserenc: use AVCodec.encode2()
  roqaudioenc: use AVCodec.encode2()
  libspeex: use AVCodec.encode2()
  libvo_amrwbenc: use AVCodec.encode2()
  libvo_aacenc: use AVCodec.encode2()
  wmaenc: use AVCodec.encode2()
  mpegaudioenc: use AVCodec.encode2()
  libmp3lame: use AVCodec.encode2()
  libgsmenc: use AVCodec.encode2()
  libfaac: use AVCodec.encode2()
  g726enc: use AVCodec.encode2()
  ...

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/ac3enc.c
	libavcodec/adxenc.c
	libavcodec/libgsm.c
	libavcodec/libvorbis.c
	libavcodec/vorbisenc.c
	libavcodec/wmaenc.c
	tests/ref/acodec/g722
	tests/ref/lavf/asf
	tests/ref/lavf/ffm
	tests/ref/lavf/mkv
	tests/ref/lavf/mpg
	tests/ref/lavf/rm
	tests/ref/lavf/ts
	tests/ref/seek/lavf_asf
	tests/ref/seek/lavf_ffm
	tests/ref/seek/lavf_mkv
	tests/ref/seek/lavf_mpg
	tests/ref/seek/lavf_rm
	tests/ref/seek/lavf_ts

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-22 00:40:11 +01:00
Michael Niedermayer
f1fdd208cc h264_mp4toannexb_bsf: use i instead of misusing unit_type. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-21 22:33:28 +01:00
Carl Eugen Hoyos
d3640096aa Fix libspeex decoding. 
This parly reverts 85469f.
Fixes ticket #1091.
 2012-03-21 22:19:23 +01:00
gs_gail
361c4cdca9 h264_mp4toannexb_bsf: support 24bit lengths 2012-03-21 21:42:44 +01:00
Reimar Döffinger
89411ae699 Replace SSE2 instruction by SSE equivalent. 
This is even potentially faster in this use-case.
Should fix AAC SBR decoding on machines with SSE but not
SSE2, fixing track issue #1041.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-03-21 20:14:50 +01:00
Justin Ruggles
6aba117f12 adxenc: use AVCodec.encode2() 2012-03-21 15:04:42 -04:00
Justin Ruggles
54e6cf8a94 adxenc: Use the AVFrame in ADXContext for coded_frame 2012-03-21 15:04:42 -04:00
Ronald S. Bultje
68fd077f68 indeo4: fix out-of-bounds function call. 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2012-03-21 19:01:08 +01:00
Paul B Mahol
98ca4d217d westwood_vqa: fix SND0 chunk handling 
Version from vqa header does not dictate which sound chunks may
appear in file.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-21 18:09:26 +01:00
Justin Ruggles
5d4017b8f3 vorbisenc: use AVCodec.encode2() 2012-03-21 12:49:36 -04:00
Justin Ruggles
e5aab2d7a4 libvorbis: use AVCodec.encode2() 2012-03-21 12:49:36 -04:00
Justin Ruggles
8ccf545b95 libopencore-amrnbenc: use AVCodec.encode2() 2012-03-21 12:49:36 -04:00
Justin Ruggles
330d9d1b50 ra144enc: use AVCodec.encode2() 2012-03-21 12:49:36 -04:00
Justin Ruggles
f090428234 nellymoserenc: use AVCodec.encode2() 2012-03-21 12:49:35 -04:00
Justin Ruggles
32173df3d2 roqaudioenc: use AVCodec.encode2() 
The first frame pts must be saved until we have 8 frames since RoQ audio
requires 8 frames in the first packet.
 2012-03-21 12:49:35 -04:00
Justin Ruggles
b03dcf07f6 libspeex: use AVCodec.encode2() 2012-03-21 12:49:35 -04:00
Justin Ruggles
57a52f258e libvo_amrwbenc: use AVCodec.encode2() 2012-03-21 12:49:35 -04:00
Justin Ruggles
db440fa12d libvo_aacenc: use AVCodec.encode2() 2012-03-21 12:49:35 -04:00
Justin Ruggles
27bacfeb57 wmaenc: use AVCodec.encode2() 2012-03-21 12:49:32 -04:00
Paul B Mahol
594a3d6315 bink: no need to increase width twice 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-21 04:18:34 +01:00
Michael Niedermayer
9e69d3c6d4 zerocodec: factorize loop 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-21 04:12:48 +01:00
Paul B Mahol
15e07348fe ttadec: refactor ttafilter_process() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-21 03:39:14 +01:00
Paul B Mahol
1a7a707f74 tgq: use bytestream2_get_bytes_left() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-21 03:09:58 +01:00
Paul B Mahol
0acacd23d4 xxan: use bytestream2_size() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-21 03:09:04 +01:00
Paul B Mahol
ff05fd6249 xxan: remove write-only variable 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-21 03:08:29 +01:00
Paul B Mahol
8a90148dfe smc: use bytestream2_size() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-21 03:07:43 +01:00
Paul B Mahol
0ee5be4ee4 bytestream: add functions for accessing size of buffer 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-21 03:05:19 +01:00
Paul B Mahol
841e669a39 cdxl: swap CHUNKY and BYTE_PLANAR 
This is how it is defined in Amiga Developer CD from year 1992 and
is consistent with files created with ADPro.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-21 03:03:33 +01:00
Michael Niedermayer
3eaf712053 sgienc: fix packet size. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-21 02:54:49 +01:00
Michael Niedermayer
0ebd83617f Merge remote-tracking branch 'qatar/master' 
* qatar/master: (27 commits)
  avconv: free packet in write_frame() when discarding due to frame number limit
  FATE: use +/- flag option syntax for vp8 emu-edge tests
  lavf: make av_interleave_packet_per_dts() private.
  lavf: deprecate av_read_packet().
  oggdec: output correct timestamps for Vorbis
  avconv: pass input stream timestamps to audio encoders
  lavc: shrink encoded audio packet size after encoding.
  xa: set correct bit rate
  xa: do not set bit_rate, block_align, or bits_per_coded_sample
  xa: fix end-of-file handling
  xa: fix timestamp calculation
  bink: fix typo in FFALIGN() argument
  bink: align plane width to 8 when calculating bundle sizes
  doc: pass -Idoc texi2html and texi2pod
  doc: texi2pod: add -I flag
  movenc: Add a min_frag_duration option
  rtsp: Set the default delay to 0.1 s for the RTSP/SDP/RTP demuxers
  libavformat: Set the default for the max_delay option to -1
  Generate manpages for AV{Format,Codec}Context AVOptions.
  doc/avconv: remove entries for AVOptions.
  ...

Conflicts:
	doc/Makefile
	doc/ffmpeg.texi
	doc/muxers.texi
	ffmpeg.c
	libavcodec/Makefile
	libavcodec/options.c
	libavcodec/vp8.c
	libavformat/options.c
	tests/fate/demux.mak
	tests/ref/fate/truemotion1-15
	tests/ref/fate/truemotion1-24

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-21 01:33:53 +01:00
Justin Ruggles
b0f75ba272 mpegaudioenc: use AVCodec.encode2() 
Update FATE references due to encoder delay.
 2012-03-20 18:56:22 -04:00
Justin Ruggles
3d853d7ab3 libmp3lame: use AVCodec.encode2() 2012-03-20 18:56:18 -04:00
Justin Ruggles
1987a940b7 libgsmenc: use AVCodec.encode2() 2012-03-20 18:55:39 -04:00
Justin Ruggles
d1afb2f94e libfaac: use AVCodec.encode2() 
Encoder output is delayed by several frames, so we keep a queue of input
frame timing info to match up with corresponding output packets.
 2012-03-20 18:55:36 -04:00
Justin Ruggles
59041fd053 g726enc: use AVCodec.encode2() 2012-03-20 18:47:23 -04:00
Justin Ruggles
bb03b6f7b1 g722enc: use AVCodec.encode2() 
FATE reference updated due timestamp rounding because of resampling from
44100 Hz to 16000 Hz in avconv.
 2012-03-20 18:47:23 -04:00
Justin Ruggles
910bdb9a42 flacenc: use AVCodec.encode2() 2012-03-20 18:47:19 -04:00
Justin Ruggles
24e74f0a0f adpcmenc: update to AVCodec.encode2() 2012-03-20 18:46:57 -04:00
Justin Ruggles
aa872af5e3 ac3enc: update to AVCodec.encode2() 
Update FATE references due to encoder delay.
 2012-03-20 18:46:56 -04:00
Justin Ruggles
ad95307f92 aacenc: use AVCodec.encode2() 2012-03-20 18:46:49 -04:00
Justin Ruggles
4bf64961a9 avcodec: add code for a frame queue for use by audio encoders with delay 
This simplifies matching of timestamps between input frames and output
packets.
 2012-03-20 16:04:21 -04:00
Michael Niedermayer
15db6a9590 pngenc: Fix incorrect mask used for interlaced mode. 
Fixes Ticket1109

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-20 20:39:32 +01:00
Justin Ruggles
f63412fc74 oggdec: output correct timestamps for Vorbis 
Takes encoder delay into account by comparing first the coded page
duration with the calculated page duration. Handles last packet duration
if needed, also by comparing coded duration with calculated duration.
Also does better handling of timestamp generation for packets in the
first page for streamed ogg files where the start time is not
necessarily zero.
 2012-03-20 14:39:57 -04:00
Justin Ruggles
a1977e0103 lavc: shrink encoded audio packet size after encoding. 2012-03-20 14:12:54 -04:00
Kostya Shishkov
1d10afd581 bink: fix typo in FFALIGN() argument 2012-03-20 18:57:51 +01:00
Kostya Shishkov
8ae28ac0f3 bink: align plane width to 8 when calculating bundle sizes 
This fixes decoding of Bink files with non-multiple-of-16 width.
 2012-03-20 16:33:57 +01:00
Michael Niedermayer
8f394a6cf8 pngdec: print error message for truncated pngs even if we output them 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-20 14:13:01 +01:00
Michael Niedermayer
309d8ec19b pngenc: allocate packets that have some chance of being large enough. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-20 14:12:16 +01:00
Michael Niedermayer
4ed47d3354 pngdec: dont discard incomplete images. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-20 13:45:19 +01:00
Michael Niedermayer
eeb792d862 pngdec: Print error messages for the various failure pathes. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-20 13:45:19 +01:00
Anton Khirnov
4fea8959d8 doc/avconv: remove entries for AVOptions. 
Documentation for those will be generated automatically.
 2012-03-20 07:09:54 +01:00
Anton Khirnov
5626697104 Move AVFormatContext/AVCodecContext option tables to separate files. 
This will allow us to automatically generate manpages for them.
 2012-03-20 07:09:18 +01:00
Derek Buitenhuis
30f2d97afe zerocodec: Fix license 
ISC doesn't contain this line, so remove it to
prevent confusion.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-20 05:01:32 +01:00
Michael Niedermayer
e01f478dd2 ffv1enc: Check context_model 
Fixes crash

Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-20 00:29:34 +01:00
Michael Niedermayer
479fb7b8af Merge remote-tracking branch 'qatar/master' 
* qatar/master: (35 commits)
  fix space type in Changelog
  ZeroCodec Decoder
  RealAudio Lossless decoder
  rtpenc: Use AVFormatContext.packet_size instead of a private option
  url: Document the expected behaviour of url_read
  libavformat: Use AVFormatContext.probesize in init_input
  docs: Fix a stray reference to tags in the generic doxy on dicts
  cosmetics: Align some AVInput/OutputFormat declarations
  zmbv: check decompress result
  zmbv: correct indentation
  adpcm: convert adpcm_thp to bytestream2.
  adpcm: convert adpcm_yamaha to bytestream2.
  adpcm: convert adpcm_swf to bytestream2.
  adpcm: convert adpcm_sbpro to bytestream2.
  adpcm: convert adpcm_ct to bytestream2.
  adpcm: convert adpcm_ima_amv/smjpeg to bytestream2.
  adpcm: convert adpcm_ea_xas to bytestream2.
  adpcm: convert adpcm_ea_r1/2/3 to bytestream2.
  adpcm: convert ea_maxis_xa to bytestream2.
  adpcm: convert adpcm_ea to bytestream2.
  ...

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/adpcm.c
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/version.h
	libavcodec/zerocodec.c
	libavcodec/zmbv.c
	libavformat/riff.c
	libavformat/url.h
	tests/ref/fate/truemotion1-15
	tests/ref/fate/truemotion1-24

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-20 00:03:19 +01:00
Michael Niedermayer
87c1783c77 snowenc: move runs from stack to heap. 
Fixes ticket1082

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-19 22:37:06 +01:00
Michael Niedermayer
fc8ed1117e avcodec_encode_audio2: Increase the audio buffer size. 
Fixes Ticket1104

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-19 22:20:04 +01:00
Aaron Colwell
30011bf201 vp8: avoid race condition on segment map. 
This change avoids accessing the segment map of the previous frame if
segmentation is not enabled for the current frame. The caller of
decode_mb_mode() only calls ff_thread_await_progress() on the reference
segmentation index array if segmentation is enabled, so Chromium's TSAN
will report a race when accessing this data while segmentation is not
enabled.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-03-19 13:49:34 -07:00
Derek Buitenhuis
0e714f889e ZeroCodec Decoder 
An obscure Japanese lossless video codec, originally intended
for use with a remote desktop application.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
 2012-03-19 19:02:23 +01:00
Stefano Sabatini
11642cd16f lavc/sunrastenc: consider cases with linesize < 0 
Make sunrast_image_write_image() deal with cases when linesize is < 0.
Fix trac ticket #1077.
 2012-03-19 19:01:40 +01:00
Kostya Shishkov
b8560637d9 RealAudio Lossless decoder 2012-03-19 18:46:34 +01:00
Carl Eugen Hoyos
0d293880ba Match documentation for transparency in BGR32 iff images. 2012-03-19 09:49:33 +01:00
Kostya Shishkov
bb39bd195a zmbv: check decompress result 
Changing flush type from Z_FINISH is needed since encoder compresses fixed
amount of data and doesn't care about writing end of stream marker.
 2012-03-19 09:21:05 +01:00
Kostya Shishkov
afc2263bcc zmbv: correct indentation 2012-03-19 09:20:39 +01:00
Michael Niedermayer
e8f2c0ca2e h264: print the pps_id when its invalid. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-19 01:43:44 +01:00
Derek Buitenhuis
6cabb679d6 ZeroCodec Decoder 
An obscure Japanese lossless video codec, originally intended
for use with a remote desktop application.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-19 00:19:13 +01:00
Michael Niedermayer
bae053fca4 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fate: make compare() function compatible with POSIX bc
  Update Janne's email address.
  APIchanges: Replace Subversion revision numbers by Git hashes.
  bytestream: Eliminate one level of pointless macro indirection.
  xwd: convert to bytestream2.
  vqavideo: port to bytestream2 API
  Read preset files with suffix .avpreset
  prores: allow user to set fixed quantiser
  lavf: remove some disabled code.
  lavf: only set average frame rate for video.
  lavf: remove a pointless check.
  avcodec: add XBM encoder

Conflicts:
	Changelog
	cmdutils.c
	cmdutils.h
	doc/APIchanges
	libavcodec/Makefile
	libavcodec/avcodec.h
	libavcodec/version.h
	libavcodec/vqavideo.c
	libavformat/img2enc.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-18 23:39:42 +01:00
Ronald S. Bultje
1744ab9e46 adpcm: convert adpcm_thp to bytestream2. 2012-03-18 15:33:19 -07:00
Ronald S. Bultje
72eda7786d adpcm: convert adpcm_yamaha to bytestream2. 2012-03-18 15:33:19 -07:00
Ronald S. Bultje
f184735a27 adpcm: convert adpcm_swf to bytestream2. 2012-03-18 15:33:19 -07:00
Ronald S. Bultje
8afe2f9002 adpcm: convert adpcm_sbpro to bytestream2. 2012-03-18 15:33:19 -07:00
Ronald S. Bultje
834c81f4c5 adpcm: convert adpcm_ct to bytestream2. 2012-03-18 15:33:19 -07:00
Ronald S. Bultje
b3084e29e6 adpcm: convert adpcm_ima_amv/smjpeg to bytestream2. 2012-03-18 15:33:16 -07:00
Ronald S. Bultje
22c48d399d adpcm: convert adpcm_ea_xas to bytestream2. 2012-03-18 15:33:16 -07:00
Ronald S. Bultje
edd9555537 adpcm: convert adpcm_ea_r1/2/3 to bytestream2. 2012-03-18 15:33:16 -07:00
Ronald S. Bultje
e60d09918c adpcm: convert ea_maxis_xa to bytestream2. 2012-03-18 15:33:15 -07:00
Ronald S. Bultje
4a876eba8d adpcm: convert adpcm_ea to bytestream2. 2012-03-18 15:33:15 -07:00
Ronald S. Bultje
524af484ed adpcm convert adpcm_ima_ea_sead to bytestream2. 2012-03-18 15:33:15 -07:00
Ronald S. Bultje
8f2ed09289 adpcm: convert adpcm_ima_ea_eacs to bytestream2. 2012-03-18 15:33:15 -07:00
Ronald S. Bultje
159831cc09 adpcm: convert adpcm_xa to bytestream2. 2012-03-18 15:33:15 -07:00
Ronald S. Bultje
16b7a5e241 adpcm: convert ima_ws to bytestream2. 2012-03-18 15:33:11 -07:00
Ronald S. Bultje
74d7ac95fb adpcm: convert adpcm_ima_apc to bytestream2. 2012-03-18 15:25:26 -07:00
Ronald S. Bultje
9721901440 adpcm: convert adpcm_ima_iss to bytestream2. 2012-03-18 15:25:26 -07:00
Ronald S. Bultje
1da9587026 adpcm: convert adpcm_dk3 to bytestream2. 2012-03-18 15:25:26 -07:00
Ronald S. Bultje
d570a96808 adpcm: convert adpcm_dk4 to bytestream2. 2012-03-18 15:25:26 -07:00
Ronald S. Bultje
5353ee3c30 adpcm: convert adpcm_ms to bytestream2. 2012-03-18 15:25:26 -07:00
Ronald S. Bultje
89f3aa8ce2 adpcm: use av_clip() in adpcm_ima_expand_nibble(). 2012-03-18 15:25:25 -07:00
Ronald S. Bultje
689be85a9a adpcm: convert adpcm_4xm to bytestream2. 2012-03-18 15:25:25 -07:00
Ronald S. Bultje
39505f4240 adpcm: convert adpcm_ima_wav to bytestream2. 2012-03-18 15:25:25 -07:00
Ronald S. Bultje
9604307dd8 adpcm: convert adpcm_ima_qt to bytestream2. 2012-03-18 15:25:25 -07:00
Ronald S. Bultje
c346f6304c adpcm: fix nb_samples rounding for adpcm_ima_dk3, and update reference. 2012-03-18 15:25:25 -07:00
Stefano Sabatini
0ca15aa066 lavc/jpeglsenc: fix allocation in case of negative linesize, and add malloc check 
Fix crash with negative linesizes, fix trac ticket #1078.
 2012-03-18 21:19:09 +01:00
Paul B Mahol
a41340f8e8 pgmyuvenc: abort encoding if width is not even 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-18 20:00:35 +01:00
Diego Biurrun
f36d5c1422 Update Janne's email address. 2012-03-18 16:07:33 +01:00
Diego Biurrun
f03183d9a8 bytestream: Eliminate one level of pointless macro indirection. 2012-03-18 16:07:32 +01:00
Ronald S. Bultje
abe3c697a3 xwd: convert to bytestream2. 2012-03-18 07:45:41 -07:00
Paul B Mahol
5a3a906ba2 vqavideo: port to bytestream2 API 
Protects against overreads.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2012-03-18 07:45:40 -07:00
Michael Niedermayer
572c0ddc89 indeo4: Skip null frames. 
Fixes crashes from Ticket845

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-18 14:07:32 +01:00
Carl Eugen Hoyos
7594ee2e6e jpg: fix colors for sequential RGB 
Fixes Ticket850

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-18 14:06:59 +01:00
Michael Niedermayer
0f6f5e6f16 vorbisenc: set quality to a reasonable default. 
Fixed Ticket847

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-03-18 14:06:59 +01:00
Kostya Shishkov
6acac061ab prores: allow user to set fixed quantiser 2012-03-18 08:04:15 +01:00