RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
33,671 Commits 36 Branches 398 Tags 225 MiB
Commit Graph

95 Commits

Author SHA1 Message Date
Michael Niedermayer 537a9e5cc2 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ppc: fix some pointer to integer casts
  ppc: fix 32-bit PIC build
  vmdaudio: fix decoding of 16-bit audio format.
  lavf: do not set codec_tag for rawvideo
  h264: check for out of bounds reads in ff_h264_decode_extradata().
  flvdec: Check for overflow before allocating arrays
  avconv: use correct output stream index when checking max_frames
  avconv: remove fake coded_frame on streamcopy hack

Conflicts:
	avconv.c
	libavcodec/h264.c
	libavcodec/ppc/asm.S
	libavcodec/vmdav.c
	libavformat/flvdec.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-25 23:30:25 +02:00
Justin Ruggles 4568c2bf97 vmdaudio: fix decoding of 16-bit audio format. 
The initial sample of each block is raw 16-bit PCM, not DPCM.
Fixes decoding of all samples in:
http://streams.videolan.org/samples/game-formats/sierra-vmd/Lighthouse/
 2011-09-25 10:39:00 -04:00
Laurent Aimar 35cb6854bb Fix potential pointer arithmetic overflows in rle_unpack() of vmd video decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-25 00:42:42 +02:00
Laurent Aimar 4749e07498 Fix out of bound reads in rle_unpack() of vmd video decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-25 00:42:06 +02:00
Laurent Aimar e07377e736 Check for out of bound reads in vmd_decode() of vmd video decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-25 00:34:39 +02:00
Laurent Aimar 78cb39d2b2 Fix potential pointer arithmetic overflows in lz_unpack of vmd video decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-25 00:27:29 +02:00
Laurent Aimar 5127f465bd Prevent out of bound read in lz_unpack in vmd video decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-25 00:25:42 +02:00
Laurent Aimar 6a6383bebc Prevent NULL dereferences when the previous frame is missing in vmd video decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-24 23:42:49 +02:00
Laurent Aimar e7aed1280e Check for invalid update parameters in vmd video decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-24 23:42:49 +02:00
Laurent Aimar 00cbe9e405 Fix potential overread in vmd audio decoder. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-09-24 23:42:49 +02:00
Michael Niedermayer faba79e080 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
  H.264: tweak some other x86 asm for Atom
  probe: Fix insane flow control.
  mpegts: remove invalid error check
  s302m: use nondeprecated audio sample format API
  lavc: use designated initialisers for all codecs.
  x86: cabac: add operand size suffixes missing from 6c32576

Conflicts:
	libavcodec/ac3enc_float.c
	libavcodec/flacenc.c
	libavcodec/frwu.c
	libavcodec/pictordec.c
	libavcodec/qtrleenc.c
	libavcodec/v210enc.c
	libavcodec/wmv2dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-07-30 06:46:08 +02:00
Anton Khirnov ec6402b7c5 lavc: use designated initialisers for all codecs. 
It's more readable and less prone to breakage.
 2011-07-29 08:42:34 +02:00
Michael Niedermayer 6cbe81999b Merge remote-tracking branch 'qatar/master' 
* qatar/master: (28 commits)
  Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample().
  x86: cabac: fix register constraints for 32-bit mode
  cabac: move x86 asm to libavcodec/x86/cabac.h
  x86: h264: cast pointers to intptr_t rather than int
  x86: h264: remove hardcoded edi in decode_significance_8x8_x86()
  x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86()
  x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86()
  x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86()
  x86: cabac: change 'a' constraint to 'r' in get_cabac_inline()
  x86: cabac: remove hardcoded esi in get_cabac_inline()
  x86: cabac: remove hardcoded edx in get_cabac_inline()
  x86: cabac: remove unused macro parameter
  x86: cabac: remove hardcoded ebx in inline asm
  x86: cabac: remove hardcoded struct offsets from inline asm
  cabac: remove inline asm under #if 0
  cabac: remove BRANCHLESS_CABAC_DECODER switch
  cabac: remove #if 0 cascade under never-set #ifdef ARCH_X86_DISABLED
  document libswscale bump
  error_resilience: skip last-MV predictor step if MVs are not available.
  error_resilience: actually add counter when adding a MV predictor.
  ...

Conflicts:
	Changelog
	libavcodec/error_resilience.c
	libavfilter/defaults.c
	libavfilter/vf_drawtext.c
	libswscale/swscale.h
	tests/ref/vsynth1/error
	tests/ref/vsynth2/error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2011-06-21 03:38:25 +02:00
Justin Ruggles e6c52cee54 Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample(). 
av_get_bits_per_sample_fmt() is deprecated.
 2011-06-20 18:56:06 -04:00
Mans Rullgard e65ab9d94f Remove unused variables 2011-06-02 20:06:00 +01:00
Clément Bœsch adba9c6352 Fix various unused variable warnings 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2011-05-30 00:24:01 +02:00
Stefano Sabatini 01042d4123 lavc: set defaults in internal codec frames 
This is required specifically for setting frame->format to -1,
otherwise it will be set to 0 = PIX_FMT_YUV420P and code reading
the format from the output decoded frame will get misled.

In particular fix regressions occurring with the pending vsrc_buffer
patch.
 2011-05-07 12:03:59 +02:00
Mans Rullgard 2912e87a6c Replace FFmpeg with Libav in licence headers 
Signed-off-by: Mans Rullgard <mans@mansr.com>
 2011-03-19 13:33:20 +00:00
Justin Ruggles 1e898e7d35 vmdaudio: output 8-bit audio as AV_SAMPLE_FMT_U8. 
There is no need to expand to 16-bits. Just use memcpy() to copy the raw data.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 1108f8998c)
 2011-02-26 03:16:04 +01:00
Justin Ruggles f3618b014b vmdaudio: remove unnecessary fields from VmdAudioContext and use the corresponding AVCodecContext fields instead. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 2ec7862db8)
 2011-02-26 03:16:04 +01:00
Justin Ruggles 5e7c422dda vmdaudio: add out_bps to VmdAudioContext and use it to replace hard-coded sample size. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 1e86d685e0)
 2011-02-26 03:16:03 +01:00
Justin Ruggles 504dff8e4e vmdaudio: simplify vmdaudio_decode_frame() by handling block_type first, then making a single call to vmdaudio_loadsound(). 
This also adds output buffer size checks for AUDIO and SILENCE block types.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 1574eff3d2)
 2011-02-26 03:16:03 +01:00
Justin Ruggles 83e94d50cb cosmetics: reindent after previous commit 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit ba9516cca8)
 2011-02-26 03:16:03 +01:00
Justin Ruggles fb0e3c2b96 vmdaudio: move all silence chunk handling to vmdaudio_loadsound(). 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 762b386e4a)
 2011-02-26 03:16:03 +01:00
Justin Ruggles 6f3c837f40 cosmetics: remove debugging cruft 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 8e9027d266)
 2011-02-26 03:16:03 +01:00
Justin Ruggles 684512e16d cosmetics: reindent after previous commit 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 868f2f4d90)
 2011-02-26 03:16:03 +01:00
Justin Ruggles aa23625037 vmdaudio: simplify buffer pointer and header size handling. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 2d213695fc)
 2011-02-26 03:16:03 +01:00
Justin Ruggles b4b5e92286 vmdaudio: set *data_size to zero when skipping small packets and add a warning log message. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 7a4fb3fd93)
 2011-02-26 03:16:03 +01:00
Justin Ruggles ebed7b6865 vmdaudio: validate block type 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 22f893e1c9)
 2011-02-26 03:16:02 +01:00
Justin Ruggles 149d36877a vmdaudio: use macros and a local variable for block type. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit dd1af5136f)
 2011-02-26 03:16:02 +01:00
Justin Ruggles 2be17a71ae vmdaudio: correct the silent chunk count in the first block. 
This fixes A/V sync with several samples, notably:
http://samples.mplayerhq.hu/game-formats/sierra-vmd/swat_*.vmd

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 6989cb2dae)
 2011-02-26 03:16:02 +01:00
Justin Ruggles c11c79222e vmdaudio: output audio samples for standalone silent blocks. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 9b73f78600)
 2011-02-26 03:16:02 +01:00
Justin Ruggles 2ac19b75c0 vmdaudio: remove duplicated code by merging mono and stereo decoding. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 1328d43313)
 2011-02-26 03:16:02 +01:00
Justin Ruggles 994e445a17 vmdaudio: fix raw_block_size calculation. 
The size should depend on the output sample size, not the internal bit depth.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit a58bcb40b1)
 2011-02-26 03:15:59 +01:00
Justin Ruggles 1108f8998c vmdaudio: output 8-bit audio as AV_SAMPLE_FMT_U8. 
There is no need to expand to 16-bits. Just use memcpy() to copy the raw data.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-23 21:52:51 -05:00
Justin Ruggles 2ec7862db8 vmdaudio: remove unnecessary fields from VmdAudioContext and use the corresponding AVCodecContext fields instead. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-23 21:52:12 -05:00
Justin Ruggles 1e86d685e0 vmdaudio: add out_bps to VmdAudioContext and use it to replace hard-coded sample size. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-23 21:51:44 -05:00
Justin Ruggles 1574eff3d2 vmdaudio: simplify vmdaudio_decode_frame() by handling block_type first, then making a single call to vmdaudio_loadsound(). 
This also adds output buffer size checks for AUDIO and SILENCE block types.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-23 21:51:12 -05:00
Justin Ruggles ba9516cca8 cosmetics: reindent after previous commit 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-23 21:49:59 -05:00
Justin Ruggles 762b386e4a vmdaudio: move all silence chunk handling to vmdaudio_loadsound(). 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-23 21:49:58 -05:00
Justin Ruggles 8e9027d266 cosmetics: remove debugging cruft 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-23 21:49:56 -05:00
Justin Ruggles 868f2f4d90 cosmetics: reindent after previous commit 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-23 21:48:04 -05:00
Justin Ruggles 2d213695fc vmdaudio: simplify buffer pointer and header size handling. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-23 21:12:39 -05:00
Justin Ruggles 7a4fb3fd93 vmdaudio: set *data_size to zero when skipping small packets and add a warning log message. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-23 21:11:36 -05:00
Justin Ruggles 22f893e1c9 vmdaudio: validate block type 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-23 21:10:12 -05:00
Justin Ruggles dd1af5136f vmdaudio: use macros and a local variable for block type. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-23 21:08:31 -05:00
Justin Ruggles 6989cb2dae vmdaudio: correct the silent chunk count in the first block. 
This fixes A/V sync with several samples, notably:
http://samples.mplayerhq.hu/game-formats/sierra-vmd/swat_*.vmd

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-23 21:06:33 -05:00
Justin Ruggles 9b73f78600 vmdaudio: output audio samples for standalone silent blocks. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-23 21:04:51 -05:00
Justin Ruggles 1328d43313 vmdaudio: remove duplicated code by merging mono and stereo decoding. 
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-23 21:02:19 -05:00
Justin Ruggles a58bcb40b1 vmdaudio: fix raw_block_size calculation. 
The size should depend on the output sample size, not the internal bit depth.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
 2011-02-23 20:58:56 -05:00