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

25526 Commits

Author SHA1 Message Date
Christian Schmidt
d9cdb7d8d6 pcm-dvd: Support channel configuration changes 
The sample buffering logic does not take into account that the blocksize
could change. Reset the buffer if the channel configuration changes,
since if there are leftover samples, it is most likely a broken or
misconcatenated stream. This could lead to negative numbers for
missing_samples during decoding.

Thanks to Michael Niedermeyer for pointing these out.
 2013-09-13 12:14:05 +02:00
Michael Niedermayer
e2774b3e3b Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Set bits_per_raw_sample when reading j2k frames.
  libopenjpegdec.c: Correctly scale gray16 output if precision < 16
  Use rc_max_rate if no video bit_rate was specified when muxing mxf_d10.
  Store the video bit_rate in the context when muxing mxf.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 22:19:46 +02:00
Paul B Mahol
1b99514dfd avcodec/smacker: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-12 16:34:54 +00:00
Michael Niedermayer
16837f9846 avcodec/aacenc: use enum for aac coder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 17:25:30 +02:00
Timothy Gu
5748e24950 aacenc: use constants to set AAC coder 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 17:22:48 +02:00
Timothy Gu
4bd910d83d aacenc: add AAC_CODER_(FAAC|ANMR|etc.) macros 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 17:22:36 +02:00
Michael Niedermayer
bfe1445871 avcodec/aic: fix "warning: comparison of unsigned expression < 0 is always false" 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 17:14:55 +02:00
Michael Niedermayer
f144168d9b avcodec/smacker: fix some memleaks 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 16:17:32 +02:00
Michael Niedermayer
fbab9a7c22 avcodec/smacker: remove check that has become redundant 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 16:17:32 +02:00
Michael Niedermayer
59a08d1939 avcodec/smacker: use the correct field instead of a hardcoded value for the index check in smacker_decode_tree() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 16:17:32 +02:00
Michael Niedermayer
fa9e8bafc8 Merge commit 'b1e469885362febce3d9a4678624e44a92f77da9' 
* commit 'b1e469885362febce3d9a4678624e44a92f77da9':
  g2meet: Allocate cursor buffers large enough to fit the aligned width

See: 3c4c5ca1c1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 14:48:55 +02:00
Michael Niedermayer
72abfba884 Merge commit '0f678c0214dccb355ed8955077a2bea46984fbc8' 
* commit '0f678c0214dccb355ed8955077a2bea46984fbc8':
  aic: Validate values read from the bitstream

Conflicts:
	libavcodec/aic.c

See: 657875b145
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 14:33:49 +02:00
Michael Niedermayer
d6e650d885 Merge commit '0d61f260010707f3028b818e8b24598e1a83d696' 
* commit '0d61f260010707f3028b818e8b24598e1a83d696':
  zmbvdec: Check the buffer size for uncompressed data

Conflicts:
	libavcodec/zmbv.c

See: 44c23aa1b8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 13:58:54 +02:00
Michael Niedermayer
4caf8c51de Merge commit 'b26742cc308552f242ee2bf93b07a3ff509f4edc' 
* commit 'b26742cc308552f242ee2bf93b07a3ff509f4edc':
  shorten: Break out of loop looking for fmt chunk if none is found

See: 5e9a56a035
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 13:38:52 +02:00
Michael Niedermayer
a44d35d90f Merge commit '49568851bf1700e3d9ea9cda29208d0df3c2c38b' 
* commit '49568851bf1700e3d9ea9cda29208d0df3c2c38b':
  shorten: Use a checked bytestream reader for the wave header

Conflicts:
	libavcodec/shorten.c

See: 5e9a56a035
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 13:31:59 +02:00
Michael Niedermayer
af539319af Merge commit 'f3d57dc69145f1b7acb4870da9ce60378190a1fd' 
* commit 'f3d57dc69145f1b7acb4870da9ce60378190a1fd':
  smacker: Free memory properly if the init function fails

Conflicts:
	libavcodec/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 12:57:58 +02:00
Michael Niedermayer
f8932d9902 Merge commit '0679cec6e8802643bbe6d5f68ca1110a7d3171da' 
* commit '0679cec6e8802643bbe6d5f68ca1110a7d3171da':
  smacker: Make sure we don't fill in huffman codes out of range

Conflicts:
	libavcodec/smacker.c

See: 1285baaab5
the added test is redundant but will be used after future refactoring

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 12:51:07 +02:00
Michael Niedermayer
d510d70df0 Merge commit 'd002fce24a7206e95f9492031f45adc35711e183' 
* commit 'd002fce24a7206e95f9492031f45adc35711e183':
  smacker: Check malloc return values

Conflicts:
	libavcodec/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-12 11:55:08 +02:00
Martin Storsjö
b1e4698853 g2meet: Allocate cursor buffers large enough to fit the aligned width 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-12 10:55:20 +03:00
Martin Storsjö
0f678c0214 aic: Validate values read from the bitstream 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-12 10:54:54 +03:00
Michael Niedermayer
0d61f26001 zmbvdec: Check the buffer size for uncompressed data 
Also don't pointlessly set the buffer size to 1 after copying
one packet.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-12 10:53:39 +03:00
Martin Storsjö
b26742cc30 shorten: Break out of loop looking for fmt chunk if none is found 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-12 10:53:04 +03:00
Martin Storsjö
49568851bf shorten: Use a checked bytestream reader for the wave header 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-12 10:52:42 +03:00
Carl Eugen Hoyos
f99f7f4025 Set bits_per_raw_sample when reading j2k frames. 2013-09-12 09:23:32 +02:00
Michael Bradshaw
7412a4a48f libopenjpegdec.c: Correctly scale gray16 output if precision < 16 
Fixes ticket #2943.

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
 2013-09-12 09:21:51 +02:00
Martin Storsjö
f3d57dc691 smacker: Free memory properly if the init function fails 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-11 20:20:50 +03:00
Martin Storsjö
0679cec6e8 smacker: Make sure we don't fill in huffman codes out of range 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-11 20:20:45 +03:00
Martin Storsjö
d002fce24a smacker: Check malloc return values 
Also try to free local allocations on errors.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-11 20:20:28 +03:00
Dylan Alex Simon
38155b47fd avcodec: add const qualifier to avcodec_find_best_pix_fmt2 args 
avcodec_find_best_pix_fmt2 does not modify its first argument so may be
marked const.  This avoids a warning when passing in AVCodec.pix_fmts.

Signed-off-by: Dylan Simon <dylan@dylex.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-11 16:54:02 +02:00
Michael Niedermayer
803445e02c Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Drop pointless directory name prefixes from #includes in the current dir

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-11 12:51:01 +02:00
Michael Niedermayer
64b6279d14 avcodec/mjpegdec: Support >8bpc color mjpeg 
Fixes Ticket2939

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-11 02:45:17 +02:00
Michael Niedermayer
7bc9fb8cde avcodec/utils: add 16bit planar YUV formats to avcodec_align_dimensions2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-11 02:45:17 +02:00
Vignesh Venkatasubramanian
ae12d65538 lavcodec: Adding support for End Trimming in Opus encoder 
Adds the end trimming value (duration to be trimmed from the end
of the file due to padding) to the packet's side data. This is
then made use by the muxer to put the value in the container.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-11 01:03:07 +02:00
Vignesh Venkatasubramanian
889bc79b5f lavc/utils: Add support for discarding samples from the end 
Adding support for discarding samples from the end based on the value in
AV_PKT_DATA_SKIP_SAMPLES side data's bytes 5-8.

Signed-off By: Vignesh Venkatasubramanian <vigneshv@google.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-10 22:53:21 +02:00
Paul B Mahol
942babd87f avcodec/vp56: use av_reallocp_array() and check if allocation failed 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-10 15:44:10 +00:00
Michael Bradshaw
9b07d34efb Make avcodec_find_best_pix_fmt_of_list const-correct 
Signed-off-by: Michael Bradshaw <mjbshaw@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-10 12:46:56 +02:00
Diego Biurrun
a0b901a348 Drop pointless directory name prefixes from #includes in the current dir 2013-09-10 12:38:41 +02:00
Paul B Mahol
d1a16564a2 avcodec/ffv1: YUVA(444,422,420) 9, 10 and 16 bit support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-09 19:49:37 +00:00
Paul B Mahol
a27227d401 avcodec/ffv1dec: fix format detection 
Fixes crash with carefuly designed files.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-09 19:49:01 +00:00
Reimar Döffinger
723cf4b29e Move packed B-frames message level to info. 
Since they generally decode fine, printing it as a warning
might not really be appropriate.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-09-09 20:51:08 +02:00
Reimar Döffinger
4ebf09c346 Make packed B-frame warning message more useful. 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2013-09-09 20:51:08 +02:00
Michael Niedermayer
3576b564ec avcodec/ffv1enc: encode slice as raw PCM in 1.4 when the buffer is too small. 
This limits the maximum size of encoded slices more tightly

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-09 20:20:21 +02:00
Michael Niedermayer
8393b80b7d avcodec/ffv1dec: Support decoding planes as raw PCM in 1.4 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-09 20:19:28 +02:00
Michael Niedermayer
77f521d9e5 avcodec/ffv1enc: check encode_line()s return code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-09 20:19:24 +02:00
Michael Niedermayer
3728603f18 avcodec/ffv1enc: update buffer check for 16bps 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-09 20:19:17 +02:00
Michael Niedermayer
904a2864bd avcodec/ffv1enc: fix size used for ff_alloc_packet2() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-09 20:19:08 +02:00
Michael Niedermayer
9a0e20817a avcodec/util: Make size argument of ff_alloc_packet2() int64_t 
This ensures that huge sizes dont get truncated before the check in ff_alloc_packet2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-09 20:18:54 +02:00
Paul B Mahol
a5615b82eb avcodec/eatgv: use av_reallocp_array() and check return value 
Fixes #2949.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-09 12:26:05 +00:00
Paul B Mahol
5e66d8ac63 avcodec/xwdenc: use AV_LOG_ERROR in error message 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-09 11:58:12 +00:00
Paul B Mahol
9bc59c108b avcodec/bmpenc: return meaningful error code 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-09 11:58:11 +00:00
Paul B Mahol
6e07bb3639 avcodec/truemotion2: use av_reallocp_array() and check return value 
Also reset tok_lens if reallocation fails.

Fixes #2946.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-09 11:53:38 +00:00
Rainer Hochecker
7d75fb381b h264: do not discard NAL_SEI when skipping frames 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-09 11:42:26 +02:00
wm4
b4e1630d4d lavc: don't show "Invalid and inefficient vfw-avi..." warning in mpeg4 parser 
Only the actual decoder should print this warning.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-09 03:14:53 +02:00
Michael Niedermayer
ce22820627 avcodec/mjpegdec: fix shift_output() with lowres 
Fixes Ticket2940

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-09 01:46:14 +02:00
Michael Niedermayer
7caaa72e62 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  libxvid: guess a good aspect when we cant store the exact one.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-08 23:49:33 +02:00
Paul B Mahol
43497d8a83 avcodec/proresdec2: return meaningful error codes 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-08 21:44:32 +00:00
Michael Niedermayer
d8fb170da2 avcodec/ratecontrol: give some trivial tips in case of buffer underflows 
See Ticket2725

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-08 23:11:39 +02:00
Carl Eugen Hoyos
43353bf32c libxvid: guess a good aspect when we cant store the exact one. 
Based on 394781a8.
 2013-09-08 22:53:14 +02:00
Paul B Mahol
cd6241b5df avcodec/truemotion2: use av_calloc() & av_malloc_array() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-08 18:56:06 +00:00
Michael Niedermayer
c54aa2fb0f avcodec/truemotion2: Fix av_freep arguments 
Fixes null pointer dereference
Fixes Ticket2944

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-08 20:27:54 +02:00
Clément Bœsch
3a54c221d5 avcodec/srtdec: fix potential overread. 2013-09-08 18:50:25 +02:00
Clément Bœsch
860a081058 avcodec/assenc: fix potential overread. 2013-09-08 18:50:25 +02:00
Paul B Mahol
7d7b4e8d5c avcodec/png: remove obsolete comments 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-08 15:13:33 +00:00
Michael Niedermayer
58e5f6a433 oMerge commit '85ac12587bfef970d0e0e4abc292df346daf8478' 
* commit '85ac12587bfef970d0e0e4abc292df346daf8478':
  nuv: check ff_rtjpeg_decode_frame_yuv420 return value

Conflicts:
	libavcodec/nuv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-08 11:40:45 +02:00
Michael Niedermayer
ea538b0d64 avcodec/snowenc: fix constness of the AVFrame argument in encode_frame() 
Some fields of the frame are changed to reflect encoder decissions like
if its a keyframe. It thus cannot be constant.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-08 05:22:45 +02:00
Luca Barbato
85ac12587b nuv: check ff_rtjpeg_decode_frame_yuv420 return value 
CC: libav-stable@libav.org
 2013-09-07 11:11:52 +02:00
Paul B Mahol
c9b5ad124e s302m: s/bits_per_coded_sample/bits_per_raw_sample 
bits_per_coded_sample should be set from demuxer and
not from decoder.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-06 17:43:35 +00:00
Paul B Mahol
6b024d8a7a avcodec/xan: use uint8_t instead of unsigned char 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-06 17:18:17 +00:00
Michael Niedermayer
2a27e52550 Merge commit '7f93a861aaf2e76fd63b53ccc465909873b8dc29' 
* commit '7f93a861aaf2e76fd63b53ccc465909873b8dc29':
  mpeg12enc: K&R formatting cosmetics

Conflicts:
	libavcodec/mpeg12enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-06 13:00:47 +02:00
Michael Niedermayer
61845dc74a Merge commit '66f091053f11a8957b2175480d2f368d2cf4474c' 
* commit '66f091053f11a8957b2175480d2f368d2cf4474c':
  mpeg12enc: drop forward declarations

Conflicts:
	libavcodec/mpeg12enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-06 12:34:09 +02:00
Michael Niedermayer
bcd1c20612 avcodec/mjpegdec: support >8bit in mjpeg_decode_scan_progressive_ac() 
Fixes Ticket2812

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-06 02:33:10 +02:00
Michael Niedermayer
b155fb08b8 avcodec/mjpegdec: move shift_output() to its own function 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-06 02:31:32 +02:00
Michael Niedermayer
c407c73457 avcodec/mjpegdec: 12bit Grayscale support 
Fixes part of Ticket2812

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-06 01:19:37 +02:00
Michael Niedermayer
1deeb9437c avcodec/mjpegdec: Fix normal jpeg with bits < 8 
Untested due to lack of testcase

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-06 01:19:37 +02:00
Michael Niedermayer
15071ed4fc avcodec/mjpegdec fix last_dc for bits != 8 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-06 01:19:37 +02:00
Michael Niedermayer
ae57e82469 avcodec/dsputil: add 12bit simple idct 
Will be needed for jpeg

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-06 01:19:37 +02:00
Diego Biurrun
befe044bb9 avcodec: Stop exporting the removed audio_resample* symbols 2013-09-05 22:11:36 +02:00
Vittorio Giovara
7f93a861aa mpeg12enc: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-09-05 21:50:24 +02:00
Vittorio Giovara
66f091053f mpeg12enc: drop forward declarations 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-09-05 12:38:43 +02:00
Michael Niedermayer
b042712a87 avcodec/mjpegdec: Simplify masking in ljpeg_decode_yuv_scan() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-05 01:39:20 +02:00
Michael Niedermayer
b394ccfe47 avcodec/mjpegdec: fix rgb ljpeg prediction 5/6/7 with point_transform 
untested due to lack of sample

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-05 01:39:20 +02:00
Michael Niedermayer
38f8640df8 avcodec/mjpegdec: fix yuv ljpeg prediction 5/6/7 with point transforms 
Fixes Ticket2826

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-05 01:39:20 +02:00
Michael Niedermayer
4ced30908f avcodec/jpeg2000dec: make SOC finding code more robust 
Fixes file from Ticket860

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-05 01:39:20 +02:00
Michael Niedermayer
cb026ac303 avcodec/mjpegdec: make "unknown colorspace" error more informative 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-05 01:39:20 +02:00
Michael Niedermayer
61c68000ed avcodec/mjpegdec: Add some sanity checks to ljpeg_decode_rgb_scan() 
These prevent the rgb ljpeg code from being run on parameters that it doesnt
support. No testcase available but it seems possible to trigger these.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-05 01:39:20 +02:00
Clément Bœsch
3e1f507f3e avcodec: make avcodec_close() more tolerant. 
See previous commit.
 2013-09-04 22:06:38 +02:00
Michael Niedermayer
9cbb3fce59 avcodec/avpacket: zero memory in av_packet_new_side_data() 
This ensures that no uninitialized bytes cause non-deterministic behavior.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-04 21:00:24 +02:00
Nicolas George
04dcdc4640 lavc/avfft: init context to 0. 
Prevent an invalid free in case of init failure.
 2013-09-04 16:37:25 +02:00
Nicolas George
d7ccfe58e3 lavc/libvorbisdec: do not return empty frames. 
Some parts of the code have been known to react badly to
empty frames; they should not, but there is no need to
take risks.
 2013-09-04 16:36:20 +02:00
Clément Bœsch
2c1eb38e5e avcodec: fix AVpacket → AVPacket typo. 2013-09-04 15:48:11 +02:00
Michael Niedermayer
2ffead98dd avcodec: add emuedge_linesize_type 
Currently all uses of the emu edge code as well as the code itself
assume int linesize
changing some but not changing all would introduce a security issue
once all use this typedef a simple search and replace can be
done to switch them all to ptrdiff_t

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-04 14:29:20 +02:00
Martin Storsjö
a711a2cb47 mpegvideo: Avoid 32-bit wrapping of linesize multiplications 
This makes sure that linesize * start_y doesn't overflow, so that
emulated_edge_mc can get back the original value if needed.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-04 14:33:29 +03:00
Michael Niedermayer
49f5519345 Merge commit 'af11fa5409cc72fc45ca7f3527400beca10967b9' 
* commit 'af11fa5409cc72fc45ca7f3527400beca10967b9':
  mjpegb: Detect changing number of planes in interlaced video

Conflicts:
	libavcodec/mjpegdec.c

See: ecc31630f9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-04 13:06:24 +02:00
Michael Niedermayer
f1b15c1ef9 Merge commit '35cbc98b720db95b923cb2d745f77bb2ee4363dc' 
* commit '35cbc98b720db95b923cb2d745f77bb2ee4363dc':
  alac: Check that the channels fit at the given offset

Conflicts:
	libavcodec/alac.c

See: b53f89710b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-04 13:02:08 +02:00
Michael Niedermayer
642207d29a Merge commit 'f7c5883126f9440547933eefcf000aa78af4821c' 
* commit 'f7c5883126f9440547933eefcf000aa78af4821c':
  alac: Limit max_samples_per_frame

See: 3920d13878
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-04 11:58:00 +02:00
Michael Niedermayer
54d628a580 Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Show subtitle resolution in avcodec_string().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-04 01:51:11 +02:00
Carl Eugen Hoyos
6fcfafff84 Show subtitle resolution in avcodec_string(). 2013-09-04 01:04:01 +02:00
Michael Niedermayer
560612344e avcodec/pictordec: remove y checks, which have become redundant 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-04 01:02:06 +02:00
Michael Niedermayer
8088d6f5f1 avcodec/pictordec: run av_image_check_size() unconditionally 
This ensures that no invalid size leaks through
(This issue is hypothetical, ive no testcase)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-04 01:02:06 +02:00
Michael Niedermayer
af11fa5409 mjpegb: Detect changing number of planes in interlaced video 
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-03 22:58:24 +03:00
Martin Storsjö
35cbc98b72 alac: Check that the channels fit at the given offset 
The code tries to decode a number of channels at the
offset given by the ff_alac_channel_layout_offsets table.
Even if the number of channels decoded so far doesn't
exceed the total number of channels, we need to check that
we actually can decode that number of channels at this offset
as well.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-03 22:57:52 +03:00
Martin Storsjö
f7c5883126 alac: Limit max_samples_per_frame 
Otherwise buffer size calculations in allocate_buffers could
overflow later, making the code think a large enough buffer
actually was allocated.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-09-03 22:56:36 +03:00
Dirk Farin
902a5fa722 avformat: H265 demuxer 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-03 19:34:04 +02:00
Paul B Mahol
6053812814 x86/simple_idct: use LOCAL_ALIGNED instead of DECLARE_ALIGNED 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-03 17:02:49 +00:00
Michael Niedermayer
f4e9c768d1 avcodec/vcr1: simplify code drop buf variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-03 15:48:33 +02:00
Michael Niedermayer
84b6451d29 avcodec/vcr1: simplify code, drop buf_size 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-03 15:48:33 +02:00
Michael Niedermayer
a4e7091831 avcodec/vcr1: return the actual number of consumed bytes 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-03 15:44:37 +02:00
Michael Niedermayer
4cfe3b7405 Merge commit '7df9e693a34c84c698da60426c78140c950f95ed' 
* commit '7df9e693a34c84c698da60426c78140c950f95ed':
  cosmetics: Fix ATRAC codec name spelling

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-03 15:05:18 +02:00
Michael Niedermayer
efb21b0a8f Merge commit '5f7aecde02a95451e514c809f2794c1deba80695' 
* commit '5f7aecde02a95451e514c809f2794c1deba80695':
  pictordec: break out of both decoding loops when y drops below 0

Conflicts:
	libavcodec/pictordec.c

The added check is redundant.
It shows the error path more clearly though

See: f3f488423a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-03 14:12:53 +02:00
Michael Niedermayer
164b67ca28 avcodec/vcr1: replace redundant checks from libav (8aba7968dd) by asserts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-03 13:45:03 +02:00
Michael Niedermayer
8ba683e629 Merge commit '8aba7968dd604aae91ee42cbce0be3dad7dceb30' 
* commit '8aba7968dd604aae91ee42cbce0be3dad7dceb30':
  vcr1: add sanity checks

Conflicts:
	libavcodec/vcr1.c

See: 845724c82c
See: 8e09482e4d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-03 13:44:44 +02:00
Vignesh Venkatasubramanian
fdd1aaf87a avpacket: Fixing side data copy when src == dst 
Fixing av_packet_copy_side_data to work correctly when source and
destination are the same. This makes sure that there is no memory
leak and double frees.

Signed-off by: Vignesh Venkatasubramanian <vigneshv@google.com>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-02 21:40:15 +02:00
Diego Biurrun
7df9e693a3 cosmetics: Fix ATRAC codec name spelling 2013-09-02 21:38:57 +02:00
Anton Khirnov
fe9bb61f9a pictordec: pass correct context to avpriv_request_sample 
Fixes invalid reads.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-09-02 19:27:56 +02:00
Anton Khirnov
5f7aecde02 pictordec: break out of both decoding loops when y drops below 0 
Otherwise picmemset can get called with negative y, resulting in an
invalid write.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-09-02 19:27:45 +02:00
Anton Khirnov
8aba7968dd vcr1: add sanity checks 
Fixes invalid reads with corrupted files.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
 2013-09-02 19:27:33 +02:00
Michael Niedermayer
4fb3e1a652 avcodec/pnmdec: fix unaligned read 
Fixes fate-lavf-pam on alpha

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-02 12:32:32 +02:00
Michael Niedermayer
62d07bb321 avcodec/pnmdec: use a more specific pointer type than void in samplecpy() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-02 12:31:55 +02:00
Carl Eugen Hoyos
ec8a4841f7 Avoid a deadlock when decoding wma. 
Fixes ticket #2925.
 2013-09-02 08:32:24 +02:00
Marton Balint
b339dccbba lavc: add teletext decoder using libzvbi 
Based on a patch by Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>.
http://lists.ffmpeg.org/pipermail/ffmpeg-devel/2012-December/136677.html

The original patch was rebased by Tudor SUCIU <tudor.suciu@gmail.com>.

Lots of additional features and fixes are made by me.

Fixes ticket #2086.

Changes since last version:
- change default page to all pages

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-02 01:19:52 +02:00
Michael Niedermayer
21dc3a3cc2 avcodec/ffv1dec: reorganize thread init/update 
This moves some allocations to init, reducing possible failure modes in update.
Always copies from the previous context instead of just during init

Fixes Ticket2923

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-01 23:22:06 +02:00
Michael Niedermayer
c72cca5a44 avcodec/ffv1dec: move initial_states init to init_thread_copy() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-01 23:22:06 +02:00
Paul B Mahol
5be7aecc80 pcm-dvd: use av_freep() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-01 19:20:39 +00:00
Paul B Mahol
fc435d977a pcm-dvd: remove redundant log message 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-01 19:19:31 +00:00
Michael Niedermayer
7c1805869d avcodec/pcm-dvd: discard buffer if block size changed 
This prevents a potential crash

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-01 13:00:39 +02:00
Martin Storsjö
789cd1de99 pcm-dvd: Fix build on big endian 
Signed-off-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-01 13:00:38 +02:00
Michael Niedermayer
cb4d05e7f2 Merge commit 'a42e3a6700547e4e49445bda81d3a89ec3e081a9' 
* commit 'a42e3a6700547e4e49445bda81d3a89ec3e081a9':
  pcm_dvd: consolidate pieces from pcm.c and mpeg.c

Conflicts:
	libavcodec/pcm.c
	libavcodec/version.h
	libavformat/mpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-01 13:00:08 +02:00
Michael Niedermayer
93cf7b0195 avcodec/h264: set er.ref_count earlier 
Fixes Ticket2910

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-01 04:02:03 +02:00
Michael Niedermayer
990bbc15b8 avcodec/error_resilience: change out commented printf() to av_log() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-09-01 03:50:08 +02:00
Martin Storsjö
21ffd41011 pcm-dvd: Fix build on big endian 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-08-31 18:06:26 +02:00
Michael Niedermayer
8da23be458 avcodec/utils: avcodec_string: print colorspace type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-31 17:22:04 +02:00
Michael Niedermayer
ea07dbdeaa avcodec/utils: avcodec_string: Print color_range 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-31 17:21:20 +02:00
Michael Niedermayer
336982a0ce avcodec/utils: avcodec_string: make the colorspace printing code more extendible. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-31 17:00:00 +02:00
Michael Niedermayer
4fa00c567c Merge remote-tracking branch 'cehoyos/master' 
* cehoyos/master:
  Fix make checkheaders for wavpackenc.h
  Fix make checkheaders for vdpau_internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-31 13:55:38 +02:00
Michael Niedermayer
b043d80be4 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  pcm_bluray: cosmetics

Conflicts:
	libavcodec/pcm-bluray.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-31 13:47:04 +02:00
Michael Niedermayer
4273236e2f Merge commit '0d6549d8b57aaa5be8efb794154cdbe9a645910f' 
* commit '0d6549d8b57aaa5be8efb794154cdbe9a645910f':
  pcm_bluray: rename pcm-mpeg.c to pcm-bluray.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-31 13:36:01 +02:00
Carl Eugen Hoyos
b970f85564 Fix make checkheaders for wavpackenc.h 2013-08-31 13:34:46 +02:00
Carl Eugen Hoyos
e7da19e9fa Fix make checkheaders for vdpau_internal.h 2013-08-31 13:32:13 +02:00
Christian Schmidt
a42e3a6700 pcm_dvd: consolidate pieces from pcm.c and mpeg.c 
Remove the header decoding for PCM audio from mpeg.c and the
20/24bit parts from pcm.c and merge them into a new decoder in
pcm-dvd.c.

The decoder has added support for samples that span multiple
packets and modified 20/24bit group decoding. Both is needed to
decode samples that have been generated with DVD-Lab Pro 2. The
decoding of 16bit PCM and two channel 24bit is identical to
before. No other samples are known to verify the correctness of
the encoding this software does.
The complete list of tested formats is
48kHz/16bit/2-8 channels
48kHz/24bit/2-5 channels
96kHz/16bit/2-4 channels
96kHz/24bit/2 channels

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2013-08-31 11:26:29 +02:00
Christian Schmidt
21fd2f84ce pcm_bluray: cosmetics 2013-08-31 11:00:46 +02:00
Christian Schmidt
0d6549d8b5 pcm_bluray: rename pcm-mpeg.c to pcm-bluray.c 
The original idea was to collect PCM codecs that could appear in various
MPEG streams in this file. Discussion in IRC lead to the conclusion that
one codec per file would be better and stop the need for #ifdefs.
 2013-08-31 11:00:46 +02:00
Michael Niedermayer
454a11a1c9 avcodec/dsputil: fix signedness in sizeof() comparissions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 23:40:47 +02:00
Michael Niedermayer
86736f59d6 avcodec/pngdsp: fix (un)signed type in end comparission 
Fixes out of array accesses
Fixes Ticket2919

Found_by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 23:22:18 +02:00
Michael Niedermayer
6e1b1a27a4 avcodec/avpacket: Use av_free_packet() in error cleanups 
This prevents memleaks on errors
reproduceable with fate when error pathes are forced

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 21:43:35 +02:00
Paul B Mahol
c042684476 kgv1dec: remove unused avctx from codec private context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-30 18:24:19 +00:00
Paul B Mahol
057dce5f21 kgv1dec: make decoder independent of sizeof(AVFrame) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-30 18:24:18 +00:00
Paul B Mahol
ea3ce00859 wnv1: remove unused avctx from codec private context 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-30 18:24:18 +00:00
Michael Niedermayer
60fed98e63 avcodec/pngdec: fix last_row_size type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 19:34:24 +02:00
Michael Niedermayer
7b47d7f75e avcodec/pngdec: Fix padded alloc code with threads 
Fixes Ticket2903
Fixes out of array write
no releases should be affected by this

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 19:34:23 +02:00
Thilo Borgmann
d814a839ac Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
Carl Eugen Hoyos
8fe1fb41ac Fix compilation with --disable-mmx. 2013-08-30 15:21:15 +02:00
Michael Niedermayer
4f5454d201 avcodec/mpegvideo: reduce log level for messages about allocating frames. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 14:20:59 +02:00
Michael Niedermayer
b05cd1ea7e ffv1dec: Check bits_per_raw_sample and colorspace for equality in ver 0/1 headers 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 13:53:58 +02:00
Michael Niedermayer
62a6052974 Merge commit 'e998b56362c711701b3daa34e7b956e7126336f4' 
* commit 'e998b56362c711701b3daa34e7b956e7126336f4':
  x86: avcodec: Consistently structure CPU extension initialization

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 12:50:01 +02:00
Michael Niedermayer
7fb758cd8e avcodec/x86/lpc: Fix cpu flag checks so they work 
Broken by 6369ba3c9c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 12:34:52 +02:00
Michael Niedermayer
c1913064e3 avcodec/x86/vp8dsp: Fix cpu flag checks so they work 
Broken by 6369ba3c9c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 12:33:56 +02:00
Michael Niedermayer
8be0e2bd43 Merge commit '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0' 
* commit '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0':
  x86: avcodec: Use convenience macros to check for CPU flags

Conflicts:
	libavcodec/x86/dsputil_init.c
	libavcodec/x86/hpeldsp_init.c
	libavcodec/x86/motion_est.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 12:08:28 +02:00
Michael Niedermayer
09c94b57ca Merge commit 'a6b650118543e1580e872896d8976042b7c32d01' 
* commit 'a6b650118543e1580e872896d8976042b7c32d01':
  ppc: cosmetics: Consistently format CPU flag detection invocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 11:48:54 +02:00
Michael Niedermayer
547d690d67 ffv1dec: check that global parameters dont change in version 0/1 
Such changes are not allowed nor supported

Fixes Ticket2906

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 05:27:51 +02:00
Michael Niedermayer
20b965a1a4 avcodec/ffv1dec: check global header version 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 03:43:49 +02:00
Michael Niedermayer
259292f9d4 avcodec/mpegvideo: Dont incorrectly warn about missing keyframes 
Files starting with B frames in presentation order generated the
"no keyframe" warning before this change.

Based on patch by: Robert Krüger <krueger@lesspain.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-30 01:45:11 +02:00
Michael Niedermayer
24b4e6c373 snow: Check av_frame_alloc() failures 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 23:23:22 +02:00
Michael Niedermayer
c4224fff1b avcodec/snow: gray support 
Fixes Ticket839

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 22:52:04 +02:00
Michael Niedermayer
811d58e083 avcodec/utils: support non edge emu for grayscale 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 22:52:04 +02:00
Michael Niedermayer
cf06dee58d libavcodec/snow: change AVFrame to pointers to AVFrame for ABI stability 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 19:46:52 +02:00
Michael Niedermayer
1cefdc397e avcodec/snowenc: remove now unneeded include <assert.h> 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 17:08:56 +02:00
Michael Niedermayer
2bc8348c85 avcodec/snowenc: convert all asserts to av_asserts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 17:08:56 +02:00
Michael Niedermayer
f07b569939 snowenc: remove disabled QUANTIZE2 code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 17:08:56 +02:00
Michael Niedermayer
f896f92337 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  cosmetics: Place arch initialization calls in alphabetical order

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 16:15:54 +02:00
Michael Niedermayer
e1c3e6277f Merge commit 'f0389eb777b1ab4291329d4f709098cdfa7384dc' 
* commit 'f0389eb777b1ab4291329d4f709098cdfa7384dc':
  arm: fmtconvert: Split armv6 fmtconvert code off from vfp code

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 16:10:39 +02:00
Michael Niedermayer
99e7c702db Merge commit 'bd549cbaacd33dfb7be81d0619c9b107b8a85be7' 
* commit 'bd549cbaacd33dfb7be81d0619c9b107b8a85be7':
  arm: dcadsp: Move synth filter initialization to dcadsp file

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 16:00:45 +02:00
Michael Niedermayer
4399e72723 Merge commit '6af2c351b3ae61e4478950ffddd0dfcad06188b8' 
* commit '6af2c351b3ae61e4478950ffddd0dfcad06188b8':
  ppc: Add missing AltiVec cpuflag detection invocations

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 15:04:59 +02:00
Michael Niedermayer
3e75f98667 Merge commit 'de81b6ae4f38273ff27020f494cc46539110d34b' 
* commit 'de81b6ae4f38273ff27020f494cc46539110d34b':
  ppc: fdct: Remove vim editor settings comment

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 15:00:02 +02:00
Michael Niedermayer
8251529ff3 Merge commit '70dd8892bf00923af838756dfbb356a9b1e4e40d' 
* commit '70dd8892bf00923af838756dfbb356a9b1e4e40d':
  mpegvideo: Replace arch initialization ifdeffery by standard conditionals

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 14:53:44 +02:00
Michael Niedermayer
37494bdb0d Merge commit 'cd529172377229f2e86987869ccc08f426bfe114' 
* commit 'cd529172377229f2e86987869ccc08f426bfe114':
  x86: rv40dsp: Move inline assembly optimizations out of YASM init section

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 14:48:46 +02:00
Michael Niedermayer
477641e9f8 Merge commit 'a64f6a04ac5773aeff2003897455dadb9609f18b' 
* commit 'a64f6a04ac5773aeff2003897455dadb9609f18b':
  dsputil: x86: Hide arch-specific initialization details

Conflicts:
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 14:32:05 +02:00
Michael Niedermayer
29daad5b98 Merge commit 'f61bece684d9685b07895508e6c1c733b5564ccf' 
* commit 'f61bece684d9685b07895508e6c1c733b5564ccf':
  ppc: Add and use convenience macro to check for AltiVec availability

Conflicts:
	libavcodec/ppc/dsputil_ppc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-29 14:24:07 +02:00
Diego Biurrun
e998b56362 x86: avcodec: Consistently structure CPU extension initialization 2013-08-29 13:07:37 +02:00
Diego Biurrun
6369ba3c9c x86: avcodec: Use convenience macros to check for CPU flags 2013-08-29 13:07:37 +02:00
Paul B Mahol
d49f2603be truemotion2: check return value of av_malloc(z) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-08-29 10:46:42 +00:00
Diego Biurrun
a6b6501185 ppc: cosmetics: Consistently format CPU flag detection invocations 2013-08-29 11:31:32 +02:00
Diego Biurrun
67e6a9f558 cosmetics: Place arch initialization calls in alphabetical order 2013-08-29 11:24:14 +02:00
Diego Biurrun
f0389eb777 arm: fmtconvert: Split armv6 fmtconvert code off from vfp code 2013-08-29 11:24:14 +02:00
Diego Biurrun
bd549cbaac arm: dcadsp: Move synth filter initialization to dcadsp file 2013-08-29 11:24:14 +02:00
Diego Biurrun
6af2c351b3 ppc: Add missing AltiVec cpuflag detection invocations 2013-08-29 00:24:46 +02:00
Diego Biurrun
de81b6ae4f ppc: fdct: Remove vim editor settings comment 2013-08-28 23:59:24 +02:00
Diego Biurrun
70dd8892bf mpegvideo: Replace arch initialization ifdeffery by standard conditionals 2013-08-28 23:59:24 +02:00
Diego Biurrun
cd52917237 x86: rv40dsp: Move inline assembly optimizations out of YASM init section 2013-08-28 23:59:24 +02:00
Diego Biurrun
a64f6a04ac dsputil: x86: Hide arch-specific initialization details 
Also give consistent names to init functions.
 2013-08-28 23:59:24 +02:00
Diego Biurrun
f61bece684 ppc: Add and use convenience macro to check for AltiVec availability 2013-08-28 23:54:15 +02:00
Rafaël Carré
91d4cfb812 apedec: do not buffer decoded samples over AVPackets 
Only consume an AVPacket when all the samples have been read.

When the rate of samples output is limited (by the default value
of max_samples), consuming the first packet immediately will cause
timing problems:

- The first packet with PTS 0 will output 4608 samples and be
consumed entirely
- The second packet with PTS 64 will output the remaining samples
(typically, a lot, that's why max_samples exist) until the decoded
samples of the first packet have been exhausted, at which point the
samples of the second packet will be decoded and output when
av_decode_frame is called with the next packet).

That means there's a PTS jump since the first packet is 'decoded'
immediately, which can be seen with avplay or mplayer: the timing
jumps immediately to 6.2s (which is the size of a packet).

Sample: http://streams.videolan.org/issues/6348/Goldwave-MAClib.ape
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
 2013-08-28 15:00:34 -04:00
Michael Niedermayer
90411f7ed6 snowenc: Fix memleak of the ratecontrol related memory 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 20:53:21 +02:00
Michael Niedermayer
f13e733145 avcodec/snow: check for malloc* failures 
Also return and pass on error codes where needed for this

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 17:09:46 +02:00
Michael Niedermayer
129f50692e snowenc: check for memory allocation failures 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 16:52:30 +02:00
Michael Niedermayer
7efa9b1794 Merge commit 'b1f9cdc37ff5d5b391d2cd9af737ab4e5a0fc1c0' 
* commit 'b1f9cdc37ff5d5b391d2cd9af737ab4e5a0fc1c0':
  ac3: Return proper error codes

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 12:28:25 +02:00
Michael Niedermayer
bfa1b42b3c Merge commit '818d1f1a3e89d35213af0bd5dc4a772713951882' 
* commit '818d1f1a3e89d35213af0bd5dc4a772713951882':
  ac3: Clean up the error paths

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 12:16:10 +02:00
Michael Niedermayer
f0ee0341b0 Merge commit '6258d362b82934a2c27557e0984aed372d98091a' 
* commit '6258d362b82934a2c27557e0984aed372d98091a':
  ac3: Do not clash with normal AVERROR

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-08-28 12:09:41 +02:00
Luca Barbato
b1f9cdc37f ac3: Return proper error codes 2013-08-27 16:19:12 +02:00
Luca Barbato
818d1f1a3e ac3: Clean up the error paths 2013-08-27 16:19:12 +02:00
Luca Barbato
6258d362b8 ac3: Do not clash with normal AVERROR 
The parsing function return AVERROR and AAC_AC3_PARSE_ERROR values,
make sure they are not misunderstood.
 2013-08-27 16:19:12 +02:00