ffmpeg.git
9 years agoffprobe: show sample_fmt in the stream section
Stefano Sabatini [Wed, 12 Oct 2011 12:53:56 +0000 (14:53 +0200)]
ffprobe: show sample_fmt in the stream section

9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 12 Oct 2011 03:33:52 +0000 (05:33 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (23 commits)
  fix AC3ENC_OPT_MODE_ON/OFF
  h264: fix HRD parameters parsing
  prores: implement multithreading.
  prores: idct sse2/sse4 optimizations.
  swscale: use aligned move for storage into temporary buffer.
  prores: extract idct into its own dspcontext and merge with put_pixels.
  h264: fix invalid shifts in init_cavlc_level_tab()
  intfloat_readwrite: fix signed addition overflows
  mov: do not misreport empty stts
  mov: cosmetics, fix for and if spacing
  id3v2: fix NULL pointer dereference
  mov: read album_artist atom
  mov: fix disc/track numbers and totals
  doc: fix references to obsolete presets directories for avconv/ffmpeg
  flashsv: return more meaningful error value
  flashsv: fix typo in av_log() message
  smacker: validate channels and sample format.
  smacker: check buffer size before reading output size
  smacker: validate number of channels
  smacker: Separate audio flags from sample rates in smacker demuxer.
  ...

Conflicts:
cmdutils.h
doc/ffmpeg.texi
libavcodec/Makefile
libavcodec/motion_est_template.c
libavformat/id3v2.c
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agocdg: enable seeking
Michael Niedermayer [Wed, 12 Oct 2011 01:39:57 +0000 (03:39 +0200)]
cdg: enable seeking

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agocdg: Try to detect keyframes.
Michael Niedermayer [Wed, 12 Oct 2011 01:38:39 +0000 (03:38 +0200)]
cdg: Try to detect keyframes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agocdg: set timestamps
Michael Niedermayer [Wed, 12 Oct 2011 01:38:08 +0000 (03:38 +0200)]
cdg: set timestamps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavf: check stream_index from read_packet() for validity.
Michael Niedermayer [Tue, 11 Oct 2011 23:04:12 +0000 (01:04 +0200)]
lavf: check stream_index from read_packet() for validity.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agopcm: Print number of bits in the error message of unsupported DVD PCM formats.
Daniel Kristjansson [Tue, 11 Oct 2011 22:47:43 +0000 (00:47 +0200)]
pcm: Print number of bits in the error message of unsupported DVD PCM formats.

9 years agoexamples/encoding: rename to decoding_encoding.c as the file is an example for both.
Michael Niedermayer [Tue, 11 Oct 2011 20:13:02 +0000 (22:13 +0200)]
examples/encoding: rename to decoding_encoding.c as the file is an example for both.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoexamples/encoding: List more formats to make it more clear to the reader what is...
Michael Niedermayer [Tue, 11 Oct 2011 20:10:26 +0000 (22:10 +0200)]
examples/encoding: List more formats to make it more clear to the reader what is not handled in libavcodec.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agomem: fix memalign hack av_realloc()
Michael Niedermayer [Tue, 11 Oct 2011 20:03:19 +0000 (22:03 +0200)]
mem: fix memalign hack av_realloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agofix AC3ENC_OPT_MODE_ON/OFF
John Stebbins [Tue, 11 Oct 2011 18:57:58 +0000 (14:57 -0400)]
fix AC3ENC_OPT_MODE_ON/OFF

The values were reversed.

Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
9 years agoarm: fix av_clipl_int32() asm
Michael Niedermayer [Tue, 11 Oct 2011 18:09:53 +0000 (20:09 +0200)]
arm: fix av_clipl_int32() asm

Note, the other arm asm code is likely affected too and should be changed as well.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoh264: fix HRD parameters parsing
Mans Rullgard [Tue, 11 Oct 2011 15:00:21 +0000 (16:00 +0100)]
h264: fix HRD parameters parsing

The bit_rate_value_minus1 and cpb_size_value_minus1 elements
allow a wider range than get_ue_golomb() supports.  This
adds a get_ue_golomb_long() function supporting up to 31
leading zeros, which is the maximum for these syntax
elements, and uses it in decode_hrd_parameters().

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agoprores: implement multithreading.
Ronald S. Bultje [Thu, 6 Oct 2011 14:17:44 +0000 (07:17 -0700)]
prores: implement multithreading.

60% speedup (overall decoding time) at 2 threads, and another 60%
speedup at 4 threads.

9 years agoprores: idct sse2/sse4 optimizations.
Ronald S. Bultje [Fri, 30 Sep 2011 12:37:11 +0000 (14:37 +0200)]
prores: idct sse2/sse4 optimizations.

~3.0-3.5x as fast as original C version, 1.6x as fast overall.

9 years agoswscale: use aligned move for storage into temporary buffer.
Ronald S. Bultje [Sun, 9 Oct 2011 04:40:01 +0000 (21:40 -0700)]
swscale: use aligned move for storage into temporary buffer.

The intermediate buffer is always aligned.

9 years agoprores: extract idct into its own dspcontext and merge with put_pixels.
Ronald S. Bultje [Thu, 6 Oct 2011 15:03:38 +0000 (08:03 -0700)]
prores: extract idct into its own dspcontext and merge with put_pixels.

9 years agoh264: fix invalid shifts in init_cavlc_level_tab()
Mans Rullgard [Tue, 11 Oct 2011 11:58:31 +0000 (12:58 +0100)]
h264: fix invalid shifts in init_cavlc_level_tab()

The level_code expression includes a shift which is invalid in
those cases where the value is not used.  Moving the calculation
to the branch where the result is used avoids these.

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agointfloat_readwrite: fix signed addition overflows
Mans Rullgard [Sat, 8 Oct 2011 01:16:29 +0000 (02:16 +0100)]
intfloat_readwrite: fix signed addition overflows

These additions might overflow the signed range for large
input values.  Converting to unsigned before the addition
rather than after avoids such undefined behaviour.  The
result under normal two's complement wraparound remains
unchanged.

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agomov: do not misreport empty stts
Luca Barbato [Tue, 11 Oct 2011 08:14:06 +0000 (10:14 +0200)]
mov: do not misreport empty stts

Return -1 instead of ENOMEM if entries is 0.
Fixes a av_malloc(0) crash in macosx.

9 years agomov: cosmetics, fix for and if spacing
Luca Barbato [Tue, 11 Oct 2011 08:12:38 +0000 (10:12 +0200)]
mov: cosmetics, fix for and if spacing

9 years agoid3v2: fix NULL pointer dereference
Anton Khirnov [Fri, 7 Oct 2011 18:09:56 +0000 (20:09 +0200)]
id3v2: fix NULL pointer dereference

Bug found by Laurent Aimar fenrir at videolan org

9 years agomov: read album_artist atom
Raivo Hool [Tue, 11 Oct 2011 07:53:40 +0000 (10:53 +0300)]
mov: read album_artist atom

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agomov: fix disc/track numbers and totals
Raivo Hool [Tue, 11 Oct 2011 07:53:39 +0000 (10:53 +0300)]
mov: fix disc/track numbers and totals

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agodoc: fix references to obsolete presets directories for avconv/ffmpeg
Diego Biurrun [Thu, 29 Sep 2011 19:57:29 +0000 (21:57 +0200)]
doc: fix references to obsolete presets directories for avconv/ffmpeg

9 years agoflashsv: return more meaningful error value
Diego Biurrun [Wed, 28 Sep 2011 12:47:58 +0000 (14:47 +0200)]
flashsv: return more meaningful error value

9 years agoflashsv: fix typo in av_log() message
Diego Biurrun [Wed, 28 Sep 2011 12:47:31 +0000 (14:47 +0200)]
flashsv: fix typo in av_log() message

9 years agoffmpeg: fix two stream related comments.
Clément Bœsch [Tue, 11 Oct 2011 12:24:20 +0000 (14:24 +0200)]
ffmpeg: fix two stream related comments.

9 years agog723.1: use memmove() where overlapping src and dst can happen.
Michael Niedermayer [Tue, 11 Oct 2011 11:45:49 +0000 (13:45 +0200)]
g723.1: use memmove() where overlapping src and dst can happen.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovc1: enable interlaced p fields again, they seem no longer to crash with out of...
Michael Niedermayer [Tue, 11 Oct 2011 11:06:30 +0000 (13:06 +0200)]
vc1: enable interlaced  p fields again, they seem no longer to crash with out of array writes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovc1: reset interlaced variables, prevent another bunch of crashes.
Michael Niedermayer [Tue, 11 Oct 2011 09:56:42 +0000 (11:56 +0200)]
vc1: reset interlaced variables, prevent another bunch of crashes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agosmacker: validate channels and sample format.
Justin Ruggles [Wed, 21 Sep 2011 15:49:33 +0000 (11:49 -0400)]
smacker: validate channels and sample format.

9 years agosmacker: check buffer size before reading output size
Justin Ruggles [Wed, 21 Sep 2011 15:42:55 +0000 (11:42 -0400)]
smacker: check buffer size before reading output size

9 years agosmacker: validate number of channels
Justin Ruggles [Wed, 21 Sep 2011 15:37:51 +0000 (11:37 -0400)]
smacker: validate number of channels

9 years agosmacker: Separate audio flags from sample rates in smacker demuxer.
Justin Ruggles [Wed, 21 Sep 2011 15:34:26 +0000 (11:34 -0400)]
smacker: Separate audio flags from sample rates in smacker demuxer.

Makes the code easier to understand.

9 years agoh264: fix detection of optional trailing PPS elements
Mans Rullgard [Mon, 10 Oct 2011 23:58:03 +0000 (00:58 +0100)]
h264: fix detection of optional trailing PPS elements

The PPS may contain a few trailing elements whose presence is
only signalled by data remaining after the the mandatory part
has been parsed.  The current code fails to take into account
the rbsp_trailing_bits() when deciding whether to parse these
optional elements.  Assuming no unnecessary padding bytes are
passed to this function, the optional elements are present if
either more than 8 extra bits remain or the remaining bits do
not form a valid rbsp_trailing_bits() after the mandatory PPS
elements have been parsed.

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agosipr: fix get_bits(0) calls
Mans Rullgard [Mon, 10 Oct 2011 19:41:31 +0000 (20:41 +0100)]
sipr: fix get_bits(0) calls

Zero-length get_bits() is undefined, must check before calling.

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agomotion_est: make MotionExtContext.map_generation unsigned
Mans Rullgard [Sun, 9 Oct 2011 19:18:34 +0000 (20:18 +0100)]
motion_est: make MotionExtContext.map_generation unsigned

The way this value is used, it should be an unsigned type.
While the numerical value has no meaning, unsigned wraparound
is relied upon.

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agoeval: document recently added random(), hypot(), gcd().
Clément Bœsch [Sat, 8 Oct 2011 10:22:44 +0000 (12:22 +0200)]
eval: document recently added random(), hypot(), gcd().

9 years agovc1: disable parts of the interlaced code due to security issues.
Michael Niedermayer [Tue, 11 Oct 2011 01:42:51 +0000 (03:42 +0200)]
vc1: disable parts of the interlaced code due to security issues.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Tue, 11 Oct 2011 00:39:50 +0000 (02:39 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master: (34 commits)
  h264: reset h->ref_count in case of errors in ff_h264_decode_ref_pic_list_reordering()
  error_resilience: fix the check for missing references in ff_er_frame_end() for H264
  4xm: prevent NULL dereference with invalid huffman table
  4xmdemux: prevent use of uninitialized memory
  4xm: clear FF_INPUT_BUFFER_PADDING_SIZE bytes in temporary buffers
  ptx: check for out of bound reads
  tiffdec: fix out of bound reads/writes
  eacmv: check for out of bound reads
  eacmv: fix potential pointer arithmetic overflows
  adpcm: fix out of bound reads due to integer overflow
  anm: prevent infinite loop
  avsdemux: check for out of bound writes
  avs: check for out of bound reads
  avsdemux: check for corrupted data
  AVOptions: refactor set_number/write_number
  AVOptions: cosmetics, rename static av_set_number2() to write_number().
  AVOptions: cosmetics, move and rename static av_set_number().
  AVOptions: split av_set_string3 into opt type-specific functions
  avidec: fix signed overflow in avi_sync()
  mxfdec: Fix some buffer overreads caused by the misuse of AVPacket related functions.
  ...

Conflicts:
Changelog
configure
libavcodec/ptx.c
libavcodec/ra144.c
libavcodec/vaapi_vc1.c
libavcodec/vc1.c
libavcodec/version.h
libavformat/4xm.c
libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoffprobe: prefer lowercase section names over uppercase ones
Stefano Sabatini [Sat, 8 Oct 2011 22:38:34 +0000 (00:38 +0200)]
ffprobe: prefer lowercase section names over uppercase ones

This is consistent with chapter names. The default writer section names
are converted to uppercase for keeping backward compatibility.

9 years agoh264: reset h->ref_count in case of errors in ff_h264_decode_ref_pic_list_reordering()
Laurent Aimar [Sun, 2 Oct 2011 14:03:47 +0000 (14:03 +0000)]
h264: reset h->ref_count in case of errors in ff_h264_decode_ref_pic_list_reordering()

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agoerror_resilience: fix the check for missing references in ff_er_frame_end() for H264
Laurent Aimar [Sun, 2 Oct 2011 00:48:12 +0000 (00:48 +0000)]
error_resilience: fix the check for missing references in ff_er_frame_end() for H264

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years ago4xm: prevent NULL dereference with invalid huffman table
Laurent Aimar [Sun, 2 Oct 2011 00:48:11 +0000 (00:48 +0000)]
4xm: prevent NULL dereference with invalid huffman table

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years ago4xmdemux: prevent use of uninitialized memory
Laurent Aimar [Sun, 2 Oct 2011 00:48:11 +0000 (00:48 +0000)]
4xmdemux: prevent use of uninitialized memory

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years ago4xm: clear FF_INPUT_BUFFER_PADDING_SIZE bytes in temporary buffers
Laurent Aimar [Sun, 2 Oct 2011 00:48:11 +0000 (00:48 +0000)]
4xm: clear FF_INPUT_BUFFER_PADDING_SIZE bytes in temporary buffers

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agoptx: check for out of bound reads
Laurent Aimar [Sun, 2 Oct 2011 00:48:12 +0000 (00:48 +0000)]
ptx: check for out of bound reads

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agotiffdec: fix out of bound reads/writes
Laurent Aimar [Fri, 30 Sep 2011 23:42:33 +0000 (23:42 +0000)]
tiffdec: fix out of bound reads/writes

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agoeacmv: check for out of bound reads
Laurent Aimar [Fri, 30 Sep 2011 23:42:32 +0000 (23:42 +0000)]
eacmv: check for out of bound reads

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agoeacmv: fix potential pointer arithmetic overflows
Laurent Aimar [Fri, 30 Sep 2011 23:42:32 +0000 (23:42 +0000)]
eacmv: fix potential pointer arithmetic overflows

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agoadpcm: fix out of bound reads due to integer overflow
Laurent Aimar [Fri, 30 Sep 2011 23:42:32 +0000 (23:42 +0000)]
adpcm: fix out of bound reads due to integer overflow

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agoanm: prevent infinite loop
Laurent Aimar [Fri, 30 Sep 2011 23:42:32 +0000 (23:42 +0000)]
anm: prevent infinite loop

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agoavsdemux: check for out of bound writes
Laurent Aimar [Fri, 30 Sep 2011 23:42:31 +0000 (23:42 +0000)]
avsdemux: check for out of bound writes

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agoavs: check for out of bound reads
Laurent Aimar [Fri, 30 Sep 2011 23:42:31 +0000 (23:42 +0000)]
avs: check for out of bound reads

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agoavsdemux: check for corrupted data
Laurent Aimar [Fri, 30 Sep 2011 23:42:31 +0000 (23:42 +0000)]
avsdemux: check for corrupted data

Signed-off-by: Janne Grunau <janne-libav@jannau.net>
9 years agolibmodplug: do not call av_expr_parse() in case of no expr specified.
Clément Bœsch [Mon, 10 Oct 2011 19:15:26 +0000 (21:15 +0200)]
libmodplug: do not call av_expr_parse() in case of no expr specified.

9 years agolibmodplug: simpler and faster use of eval expr.
Clément Bœsch [Mon, 10 Oct 2011 19:09:30 +0000 (21:09 +0200)]
libmodplug: simpler and faster use of eval expr.

9 years agoAVOptions: refactor set_number/write_number
Anton Khirnov [Tue, 23 Aug 2011 10:58:49 +0000 (12:58 +0200)]
AVOptions: refactor set_number/write_number

write_number() does the actual writing of the supplied
number to destination. Move finding the option and choosing destination
address out of it.

9 years agoAVOptions: cosmetics, rename static av_set_number2() to write_number().
Anton Khirnov [Tue, 23 Aug 2011 11:07:17 +0000 (13:07 +0200)]
AVOptions: cosmetics, rename static av_set_number2() to write_number().

9 years agoAVOptions: cosmetics, move and rename static av_set_number().
Anton Khirnov [Tue, 23 Aug 2011 11:03:42 +0000 (13:03 +0200)]
AVOptions: cosmetics, move and rename static av_set_number().

9 years agoAVOptions: split av_set_string3 into opt type-specific functions
Anton Khirnov [Tue, 23 Aug 2011 08:23:57 +0000 (10:23 +0200)]
AVOptions: split av_set_string3 into opt type-specific functions

Also stop attempting to honor the alloc parameter, as things break
horribly in that case.
It will be removed in upcoming successor to av_set_string3.

9 years agoavidec: fix signed overflow in avi_sync()
Mans Rullgard [Sat, 8 Oct 2011 00:51:37 +0000 (01:51 +0100)]
avidec: fix signed overflow in avi_sync()

Keeping byte values read from the file as unsigned is consistent
with how they are subsequently used and avoids an undefined left
shift by 24 when bit 7 is set.

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agomxfdec: Fix some buffer overreads caused by the misuse of AVPacket related functions.
Alex Converse [Sat, 8 Oct 2011 01:41:06 +0000 (18:41 -0700)]
mxfdec: Fix some buffer overreads caused by the misuse of AVPacket related functions.

9 years agodnxhddec: handle cid change in bitstream.
Baptiste Coudurier [Sun, 26 Jun 2011 21:08:22 +0000 (14:08 -0700)]
dnxhddec: handle cid change in bitstream.

9 years agovc1: K&R reformatting cosmetics
Kostya Shishkov [Mon, 10 Oct 2011 14:04:58 +0000 (16:04 +0200)]
vc1: K&R reformatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
9 years agomxfdec: Move FooterPartition to MXFContext and make sure it's never set to zero
Tomas Härdin [Fri, 7 Oct 2011 13:48:00 +0000 (15:48 +0200)]
mxfdec: Move FooterPartition to MXFContext and make sure it's never set to zero

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agora288: log an error message when output buffer is too small.
Justin Ruggles [Wed, 14 Sep 2011 18:46:50 +0000 (14:46 -0400)]
ra288: log an error message when output buffer is too small.

also return AVERROR(EINVAL) instead of -1.

9 years agora288: use a more descriptive calculation for output data size
Justin Ruggles [Wed, 14 Sep 2011 18:46:02 +0000 (14:46 -0400)]
ra288: use a more descriptive calculation for output data size

9 years agora144: use macro constants to make the code more understandable.
Justin Ruggles [Wed, 14 Sep 2011 18:42:31 +0000 (14:42 -0400)]
ra144: use macro constants to make the code more understandable.

9 years agora144dec: log an error message when output buffer is too small.
Justin Ruggles [Wed, 14 Sep 2011 18:24:59 +0000 (14:24 -0400)]
ra144dec: log an error message when output buffer is too small.

also return AVERROR(EINVAL) instead of -1.

9 years agora144dec: use a more descriptive calculation for output data size
Justin Ruggles [Wed, 14 Sep 2011 18:24:02 +0000 (14:24 -0400)]
ra144dec: use a more descriptive calculation for output data size

9 years agoSupport playing SMV files.
Reimar Döffinger [Sat, 27 Aug 2011 17:27:07 +0000 (19:27 +0200)]
Support playing SMV files.

Audio and video are interleaved via stream cur_dts - no idea how
reliable this is.
It also cannot display the video properly - it is stored with
about 15 in a single JPEG frame, I cannot think of a reasonable
way to implement this.
Samples: http://samples.mplayerhq.hu/smv/
Format description: http://wiki.multimedia.cx/index.php?title=SMV

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
9 years agolibmodplug: add bintext video stream capability.
Clément Bœsch [Fri, 7 Oct 2011 17:25:35 +0000 (19:25 +0200)]
libmodplug: add bintext video stream capability.

9 years agoswresample: fix another broken indent chunk.
Clément Bœsch [Mon, 10 Oct 2011 13:54:09 +0000 (15:54 +0200)]
swresample: fix another broken indent chunk.

Also use a consistent style inside that block.

9 years agompegts: reduce av_log level for seek back to begin on unseekable protocols to info...
Michael Niedermayer [Mon, 10 Oct 2011 13:40:08 +0000 (15:40 +0200)]
mpegts: reduce av_log level for seek back to begin on unseekable protocols to info level.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agolavc: Micro version bump for VC1 interlaced decoding support
Mashiat Sarker Shakkhar [Thu, 6 Oct 2011 19:00:27 +0000 (00:00 +0500)]
lavc: Micro version bump for VC1 interlaced decoding support

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agovc1dec: interlaced stream decoding support 3/3
Mashiat Sarker Shakkhar [Thu, 6 Oct 2011 19:00:26 +0000 (00:00 +0500)]
vc1dec: interlaced stream decoding support 3/3

Cosmetics: break some lines and reformat TODOs

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agovc1dec: interlaced stream decoding support 2/3
Mashiat Sarker Shakkhar [Thu, 6 Oct 2011 19:00:25 +0000 (00:00 +0500)]
vc1dec: interlaced stream decoding support 2/3

Cosmetics: reformat some data tables in vc1data.c

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agovc1dec: interlaced stream decoding support 1/3
Mashiat Sarker Shakkhar [Thu, 6 Oct 2011 19:00:24 +0000 (00:00 +0500)]
vc1dec: interlaced stream decoding support 1/3

Signed-off-by: Anton Khirnov <anton@khirnov.net>
9 years agompegts: Attempt to seek back to beginning in non-seekable mpegts files.
Petter Ericson [Mon, 10 Oct 2011 12:22:11 +0000 (14:22 +0200)]
mpegts: Attempt to seek back to beginning in non-seekable mpegts files.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agovaapi: Fix VC-1 decoding (reconstruct bitstream TTFRM correctly).
Gwenole Beauchesne [Mon, 10 Oct 2011 11:51:41 +0000 (13:51 +0200)]
vaapi: Fix VC-1 decoding (reconstruct bitstream TTFRM correctly).

Signed-off-by: Diego Biurrun <diego@biurrun.de>
9 years agoconfigure: Add -Wstrict-prototypes to CFLAGS if available.
Diego Biurrun [Mon, 10 Oct 2011 08:31:31 +0000 (10:31 +0200)]
configure: Add -Wstrict-prototypes to CFLAGS if available.

9 years agoavidec: simplify size parameter in memset()
Janne Grunau [Mon, 10 Oct 2011 11:28:18 +0000 (13:28 +0200)]
avidec: simplify size parameter in memset()

9 years agoAdd G.723.1 to the documentation.
Carl Eugen Hoyos [Mon, 10 Oct 2011 08:49:16 +0000 (10:49 +0200)]
Add G.723.1 to the documentation.

9 years agoBump minor for G.723.1 encoder and muxer.
Carl Eugen Hoyos [Mon, 10 Oct 2011 08:25:07 +0000 (10:25 +0200)]
Bump minor for G.723.1 encoder and muxer.

9 years agoswresample: fix broken indent.
Clément Bœsch [Mon, 10 Oct 2011 07:56:03 +0000 (09:56 +0200)]
swresample: fix broken indent.

9 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 10 Oct 2011 01:41:49 +0000 (03:41 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpeg4dec: use unsigned type for startcode in ff_mpeg4_decode_picture_header
  mpeg124: use sign_extend() function
  ac3dec: use get_sbits() instead of manually sign-extending
  4xm: fix signed overflow
  wmavoice: fix a signed overflow
  mpegvideo_enc: fix a signed overflow
  crc: fix signed overflow
  fate: run avconv with -nostats flag
  avtools: add -v as alias for -loglevel
  avconv: always print stats with AV_LOG_INFO
  doc/avconv: add forgotten output/per-stream info to -filter
  avconv: add -stats option to enable/disable printing encoding progress
  avconv: in output_packet() don't set decoded_data_size for video.
  avconv: remove pointless always true condition
  avconv: factorize common code in transcode_init()
  zmbv: remove memcpy() of decoded frame
  mpeg12enc: use sign_extend() function
  h264pred: use unsigned types for pixel values, fix signed overflows
  h264: fix signed overflows in x*0x01010101 expressions
  h264pred: remove unused variables

Conflicts:
avconv.c
tests/fate-run.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
9 years agoreg tests: add g723.1
Michael Niedermayer [Mon, 10 Oct 2011 00:54:12 +0000 (02:54 +0200)]
reg tests: add g723.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agog723.1 encoder
Mohamed Naufal [Mon, 10 Oct 2011 00:48:34 +0000 (02:48 +0200)]
g723.1 encoder

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agog723.1 muxer
Mohamed Naufal [Mon, 10 Oct 2011 00:48:16 +0000 (02:48 +0200)]
g723.1 muxer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
9 years agompeg4dec: use unsigned type for startcode in ff_mpeg4_decode_picture_header
Mans Rullgard [Sun, 9 Oct 2011 22:21:01 +0000 (23:21 +0100)]
mpeg4dec: use unsigned type for startcode in ff_mpeg4_decode_picture_header

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agompeg124: use sign_extend() function
Mans Rullgard [Sun, 9 Oct 2011 22:16:07 +0000 (23:16 +0100)]
mpeg124: use sign_extend() function

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agoac3dec: use get_sbits() instead of manually sign-extending
Mans Rullgard [Sun, 9 Oct 2011 22:15:17 +0000 (23:15 +0100)]
ac3dec: use get_sbits() instead of manually sign-extending

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years ago4xm: fix signed overflow
Mans Rullgard [Sun, 9 Oct 2011 19:38:01 +0000 (20:38 +0100)]
4xm: fix signed overflow

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agowmavoice: fix a signed overflow
Mans Rullgard [Sun, 9 Oct 2011 19:46:22 +0000 (20:46 +0100)]
wmavoice: fix a signed overflow

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agompegvideo_enc: fix a signed overflow
Mans Rullgard [Sun, 9 Oct 2011 19:32:58 +0000 (20:32 +0100)]
mpegvideo_enc: fix a signed overflow

Signed-off-by: Mans Rullgard <mans@mansr.com>
9 years agoDo not auto-detect Sorenson Spark in f4v.
Carl Eugen Hoyos [Sun, 9 Oct 2011 20:58:31 +0000 (22:58 +0200)]
Do not auto-detect Sorenson Spark in f4v.

Assuming codec_tag H263 for FLV only leads to trouble.

9 years agoBe less verbose about continuity check errors.
Carl Eugen Hoyos [Sun, 9 Oct 2011 20:47:35 +0000 (22:47 +0200)]
Be less verbose about continuity check errors.

9 years agoprores: check slice mb_y against mb_height
Michael Niedermayer [Sun, 9 Oct 2011 19:58:13 +0000 (21:58 +0200)]
prores: check slice mb_y against mb_height

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>