ffmpeg.git
7 years agoimg2enc: ensure that the codec is rawvideo for split planes mode.
Michael Niedermayer [Tue, 6 Nov 2012 00:13:12 +0000 (01:13 +0100)]
img2enc: ensure that the codec is rawvideo for split planes mode.

Found-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoexamples/demuxing: fix braino
Stefano Sabatini [Tue, 6 Nov 2012 00:06:35 +0000 (01:06 +0100)]
examples/demuxing: fix braino

s/video/audio/ in a log message.

7 years agoexamples/demuxing: dump input information *after* trying to open audio stream
Stefano Sabatini [Tue, 6 Nov 2012 00:05:14 +0000 (01:05 +0100)]
examples/demuxing: dump input information *after* trying to open audio stream

Implement more logical code flow.

7 years agofate: add more pix_fmt tests for xwd
Paul B Mahol [Mon, 5 Nov 2012 20:34:13 +0000 (20:34 +0000)]
fate: add more pix_fmt tests for xwd

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 5 Nov 2012 22:00:23 +0000 (23:00 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  FATE: add a 24-bit FLAC encoding test
  FATE: rename FLAC tests from flac-* to flac-16-*
  flacenc: use RICE2 entropy coding mode for 24-bit
  flacenc: add 24-bit encoding
  flacdsp: move lpc encoding from FLAC encoder to FLACDSPContext

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '5ff998a233d759d0de83ea6f95c383d03d25d88e'
Michael Niedermayer [Mon, 5 Nov 2012 21:51:20 +0000 (22:51 +0100)]
Merge commit '5ff998a233d759d0de83ea6f95c383d03d25d88e'

* commit '5ff998a233d759d0de83ea6f95c383d03d25d88e':
  flacenc: use uint64_t for bit counts
  flacenc: remove wasted trailing 0 bits
  lavu: add av_ctz() for trailing zero bit count
  flacenc: use a separate buffer for byte-swapping for MD5 checksum on big-endian
  fate: aac: Place LATM tests and general AAC tests in different groups
  build: The A64 muxer depends on rawenc.o for ff_raw_write_packet()

Conflicts:
doc/APIchanges
libavutil/version.h
tests/fate/aac.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '930e26a3ea9d223e04bac4cdde13697cec770031'
Michael Niedermayer [Mon, 5 Nov 2012 21:36:05 +0000 (22:36 +0100)]
Merge commit '930e26a3ea9d223e04bac4cdde13697cec770031'

* commit '930e26a3ea9d223e04bac4cdde13697cec770031':
  x86: h264qpel: Only define mmxext QPEL functions if H264QPEL is enabled
  x86: PABSW: port to cpuflags
  x86: vc1dsp: port to cpuflags
  rtmp: Use av_strlcat instead of strncat

Conflicts:
libavcodec/x86/h264_qpel.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agortmpproto: Use av_strlcat instead of strncat
Martin Storsjö [Mon, 5 Nov 2012 09:13:33 +0000 (11:13 +0200)]
rtmpproto: Use av_strlcat instead of strncat

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Fixes: [FFmpeg-devel] rtmpproto compile error
Similar patch: [FFmpeg-devel] [PATCH] call to strncat replaced with av_strlcat to avoid compile issue with systems implementing strncat via strcat.

7 years agoavrndec: use more meaningful error codes
Paul B Mahol [Mon, 5 Nov 2012 20:44:21 +0000 (20:44 +0000)]
avrndec: use more meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavf/avr: make .long_name consistent with others
Paul B Mahol [Mon, 5 Nov 2012 20:41:32 +0000 (20:41 +0000)]
lavf/avr: make .long_name consistent with others

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agocljr: use meaningful error code
Paul B Mahol [Mon, 5 Nov 2012 20:40:43 +0000 (20:40 +0000)]
cljr: use meaningful error code

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoFATE: add a 24-bit FLAC encoding test
Justin Ruggles [Mon, 5 Nov 2012 17:49:36 +0000 (12:49 -0500)]
FATE: add a 24-bit FLAC encoding test

7 years agoflacenc: use uint64_t for bit counts
Justin Ruggles [Sat, 27 Oct 2012 03:22:38 +0000 (23:22 -0400)]
flacenc: use uint64_t for bit counts

Needed to avoid integer overflows for 24-bit encoding.

7 years agoFATE: rename FLAC tests from flac-* to flac-16-*
Justin Ruggles [Sat, 27 Oct 2012 05:22:07 +0000 (01:22 -0400)]
FATE: rename FLAC tests from flac-* to flac-16-*

This will distinguish FLAC 16-bit tests from FLAC tests with other bit
depths.

7 years agoflacenc: remove wasted trailing 0 bits
Justin Ruggles [Thu, 25 Oct 2012 19:07:59 +0000 (15:07 -0400)]
flacenc: remove wasted trailing 0 bits

7 years agoflacenc: use RICE2 entropy coding mode for 24-bit
Justin Ruggles [Sat, 27 Oct 2012 04:46:43 +0000 (00:46 -0400)]
flacenc: use RICE2 entropy coding mode for 24-bit

7 years agoflacenc: add 24-bit encoding
Justin Ruggles [Sat, 27 Oct 2012 04:26:02 +0000 (00:26 -0400)]
flacenc: add 24-bit encoding

7 years agoflacdsp: move lpc encoding from FLAC encoder to FLACDSPContext
Justin Ruggles [Sat, 27 Oct 2012 04:25:04 +0000 (00:25 -0400)]
flacdsp: move lpc encoding from FLAC encoder to FLACDSPContext

Also, templatize the functions for 16-bit and 32-bit sample range. This will
be used for 24-bit FLAC encoding.

7 years agolavu: add av_ctz() for trailing zero bit count
Justin Ruggles [Fri, 26 Oct 2012 18:48:40 +0000 (14:48 -0400)]
lavu: add av_ctz() for trailing zero bit count

7 years agoflacenc: use a separate buffer for byte-swapping for MD5 checksum on big-endian
Justin Ruggles [Thu, 25 Oct 2012 19:00:10 +0000 (15:00 -0400)]
flacenc: use a separate buffer for byte-swapping for MD5 checksum on big-endian

This is much faster than calculating the MD5 one sample at a time.

7 years agoudp: check ff_socket_nonblock() return code
Michael Niedermayer [Mon, 5 Nov 2012 20:21:04 +0000 (21:21 +0100)]
udp: check ff_socket_nonblock() return code

Fixes CID733719
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: aac: Place LATM tests and general AAC tests in different groups
Diego Biurrun [Sat, 20 Oct 2012 10:21:41 +0000 (12:21 +0200)]
fate: aac: Place LATM tests and general AAC tests in different groups

7 years agobuild: The A64 muxer depends on rawenc.o for ff_raw_write_packet()
Diego Biurrun [Fri, 2 Nov 2012 21:49:04 +0000 (22:49 +0100)]
build: The A64 muxer depends on rawenc.o for ff_raw_write_packet()

7 years agox86: h264qpel: Only define mmxext QPEL functions if H264QPEL is enabled
Diego Biurrun [Fri, 2 Nov 2012 17:25:08 +0000 (18:25 +0100)]
x86: h264qpel: Only define mmxext QPEL functions if H264QPEL is enabled

This fixes compilation with --disable-everything and components enabled.

7 years agosegment: fix null ptr deref
Michael Niedermayer [Mon, 5 Nov 2012 19:25:25 +0000 (20:25 +0100)]
segment: fix null ptr deref

Fixes CID732220
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoAVR demuxer
Paul B Mahol [Sat, 3 Nov 2012 18:09:46 +0000 (18:09 +0000)]
AVR demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agodpcm: use AV_LOG_ERROR for error message.
Piotr Bandurski [Mon, 5 Nov 2012 16:44:24 +0000 (17:44 +0100)]
dpcm: use AV_LOG_ERROR for error message.

7 years agoriff: add "lsvm" FourCC for H263.
Piotr Bandurski [Mon, 5 Nov 2012 16:43:01 +0000 (17:43 +0100)]
riff: add "lsvm" FourCC for H263.

7 years agodocs/ffserver: document ffm/ffm2
Michael Niedermayer [Mon, 5 Nov 2012 15:24:57 +0000 (16:24 +0100)]
docs/ffserver: document ffm/ffm2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoffm: redesign header format to make it extensible
Michael Niedermayer [Tue, 9 Oct 2012 01:49:40 +0000 (03:49 +0200)]
ffm: redesign header format to make it extensible

Currently FFM files generated with one versions of ffmpeg generally
cannot be read by another.
By spliting data into chunks, more fields can saftely be appended to
chunks as well as new chunks added.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: add more pix_fmt tests for pam
Paul B Mahol [Mon, 5 Nov 2012 12:53:14 +0000 (12:53 +0000)]
fate: add more pix_fmt tests for pam

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agox86: PABSW: port to cpuflags
Diego Biurrun [Sun, 15 Jul 2012 15:59:26 +0000 (17:59 +0200)]
x86: PABSW: port to cpuflags

7 years agox86: vc1dsp: port to cpuflags
Diego Biurrun [Sun, 15 Jul 2012 16:49:44 +0000 (18:49 +0200)]
x86: vc1dsp: port to cpuflags

7 years agortmp: Use av_strlcat instead of strncat
Martin Storsjö [Mon, 5 Nov 2012 09:01:24 +0000 (11:01 +0200)]
rtmp: Use av_strlcat instead of strncat

Signed-off-by: Martin Storsjö <martin@martin.st>
7 years agolavfi: stop using -1 instead use AV_PIX_FMT_NONE/AV_SAMPLE_FMT_NONE
Paul B Mahol [Mon, 5 Nov 2012 13:34:08 +0000 (13:34 +0000)]
lavfi: stop using -1 instead use AV_PIX_FMT_NONE/AV_SAMPLE_FMT_NONE

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoframe_thread_encoder: fix handling of case where the encoder does not output a packet.
Michael Niedermayer [Mon, 5 Nov 2012 12:18:13 +0000 (13:18 +0100)]
frame_thread_encoder: fix handling of case where the encoder does not output a packet.

This case could cause a deadlock

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agofate: add smjpegenc test
Paul B Mahol [Mon, 5 Nov 2012 00:05:10 +0000 (00:05 +0000)]
fate: add smjpegenc test

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agolavf/srtdec: recognize subtitles starting at event index 0.
Clément Bœsch [Sun, 4 Nov 2012 22:22:28 +0000 (23:22 +0100)]
lavf/srtdec: recognize subtitles starting at event index 0.

7 years agoWrite tiff tag YCbCrPositioning if chroma_sample_location is top-left.
Carl Eugen Hoyos [Mon, 5 Nov 2012 03:43:17 +0000 (04:43 +0100)]
Write tiff tag YCbCrPositioning if chroma_sample_location is top-left.

7 years agofate: try to fix mxpeg failures
Michael Niedermayer [Mon, 5 Nov 2012 01:09:38 +0000 (02:09 +0100)]
fate: try to fix mxpeg failures

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopnm: cosmetics: reindent
Paul B Mahol [Sun, 4 Nov 2012 23:35:09 +0000 (23:35 +0000)]
pnm: cosmetics: reindent

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agopnm: remove duplicated check for maxval > 255
Paul B Mahol [Sun, 4 Nov 2012 23:33:17 +0000 (23:33 +0000)]
pnm: remove duplicated check for maxval > 255

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agofilmstripenc: fix rounding that caused fate failure
Michael Niedermayer [Sun, 4 Nov 2012 23:21:04 +0000 (00:21 +0100)]
filmstripenc: fix rounding that caused fate failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooggenc: remove unneeded null check.
Michael Niedermayer [Sun, 4 Nov 2012 20:58:35 +0000 (21:58 +0100)]
oggenc: remove unneeded null check.

The code would have segfaulted before if it where null

Fixes CID732218
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agooss: warn when non block mode cannot be enabled.
Michael Niedermayer [Sun, 4 Nov 2012 20:23:13 +0000 (21:23 +0100)]
oss: warn when non block mode cannot be enabled.

Fixes CID732183
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agopnm: remove nonsense code
Paul B Mahol [Sun, 4 Nov 2012 23:17:12 +0000 (23:17 +0000)]
pnm: remove nonsense code

If maxval is more than 255 than each value takes 2 bytes with most
significant byte first.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agofate: add MxPEG test
Paul B Mahol [Sat, 3 Nov 2012 23:43:11 +0000 (23:43 +0000)]
fate: add MxPEG test

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agocdxl: add read_probe function
Paul B Mahol [Sun, 4 Nov 2012 16:16:01 +0000 (16:16 +0000)]
cdxl: add read_probe function

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agofate: add some missing dependencies
Paul B Mahol [Sun, 4 Nov 2012 15:12:26 +0000 (15:12 +0000)]
fate: add some missing dependencies

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoivi_common: dc_transform is needed for intra
Michael Niedermayer [Sun, 4 Nov 2012 18:11:21 +0000 (19:11 +0100)]
ivi_common: dc_transform is needed for intra

Fixes CID90582 CID90536
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoff_ac3_apply_rematrixing: set flags to NULL
Michael Niedermayer [Sun, 4 Nov 2012 17:47:20 +0000 (18:47 +0100)]
ff_ac3_apply_rematrixing: set flags to NULL

This makes the code more robust

Related to CID703820
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu: drop disabled FF_API_OLD_TC_ADJUST_FRAMENUM code
Stefano Sabatini [Sun, 4 Nov 2012 11:05:30 +0000 (12:05 +0100)]
lavu: drop disabled FF_API_OLD_TC_ADJUST_FRAMENUM code

7 years agodoc/libavcodec: apply misc minor typo fixes
Stefano Sabatini [Sun, 4 Nov 2012 14:50:52 +0000 (15:50 +0100)]
doc/libavcodec: apply misc minor typo fixes

7 years agolavfi/scale: declare the filter private class
Stefano Sabatini [Sun, 4 Nov 2012 14:44:01 +0000 (15:44 +0100)]
lavfi/scale: declare the filter private class

Allow to show the supported options in the ffmpeg -h full output.

7 years agolcldec: fix decoding of uncompressed rgb24 sample
Paul B Mahol [Fri, 2 Nov 2012 21:33:52 +0000 (21:33 +0000)]
lcldec: fix decoding of uncompressed rgb24 sample

Sample from ticket #1216 does not use any compression but bitstream
claims it is. Reference decoder decodes sample just fine.

Fixes #1216.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agosmush: improve probing
Paul B Mahol [Sun, 4 Nov 2012 16:40:21 +0000 (16:40 +0000)]
smush: improve probing

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoaacsbr: fix integer overflow
Michael Niedermayer [Sun, 4 Nov 2012 16:30:56 +0000 (17:30 +0100)]
aacsbr: fix integer overflow

Fixes CID603186
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoSupport new transparency colour-spaces with libopenjpeg.
Carl Eugen Hoyos [Sun, 4 Nov 2012 16:32:31 +0000 (17:32 +0100)]
Support new transparency colour-spaces with libopenjpeg.

Reviewed-by: Michael Bradshaw
7 years agoindeo3: move get_buffer() above decode_plane() calls
Paul B Mahol [Sun, 4 Nov 2012 14:34:02 +0000 (14:34 +0000)]
indeo3: move get_buffer() above decode_plane() calls

This ensure that decode_plane() mmx code like AV_COPY64()
does not interfere with possible float instructions in
release_buffer/get_buffer.

Found-by: Carl Eugen Hoyos
Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoffserver: zero dest_addr
Michael Niedermayer [Sun, 4 Nov 2012 04:17:50 +0000 (05:17 +0100)]
ffserver: zero dest_addr

Fixes CID733838
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agosab_diamond_search: add assert to double check the minima_count
Michael Niedermayer [Sun, 4 Nov 2012 03:46:53 +0000 (04:46 +0100)]
sab_diamond_search: add assert to double check the minima_count

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc: add libavcodec.texi
Stefano Sabatini [Thu, 1 Nov 2012 12:20:44 +0000 (13:20 +0100)]
doc: add libavcodec.texi

The option chapter is based on the avoptions_codec.texi auto-generated
file.

7 years agocmdutils: allow to set the report file name.
Nicolas George [Fri, 2 Nov 2012 12:15:51 +0000 (13:15 +0100)]
cmdutils: allow to set the report file name.

The file name can be set by setting the FFREPORT environment
variable to "file=something".

Fix trac ticket #1823.

7 years agolavu/opt: implement av_opt_get_key_value().
Nicolas George [Fri, 2 Nov 2012 10:55:53 +0000 (11:55 +0100)]
lavu/opt: implement av_opt_get_key_value().

This function does the low-level work of av_opt_set_from_string()
but can be used when there is no option context or when a generic
handling of unknown keys is needed.

av_opt_set_from_string() is changed to make use of it.

7 years agolavu/opt: parse key into a mallocated buffer.
Nicolas George [Fri, 2 Nov 2012 10:35:12 +0000 (11:35 +0100)]
lavu/opt: parse key into a mallocated buffer.

It removes the hardcoded limit on the key size without making
the code much more complex, and it makes for a more versatile API.

7 years agoRevert "cmdutils: allow specifying the file for -report"
Michael Niedermayer [Thu, 1 Nov 2012 23:24:26 +0000 (00:24 +0100)]
Revert "cmdutils: allow specifying the file for -report"

This reverts commit 841bf0ef240f0d862b1f07076e079829456fb117.
This does not fully work as the file is used before the filename is parsed
so not all information is written in the specified file.

7 years agovocenc: fix 10l regression
Paul B Mahol [Sun, 4 Nov 2012 04:46:10 +0000 (04:46 +0000)]
vocenc: fix 10l regression

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agovocenc: abort if unsupported codec is used
Paul B Mahol [Sun, 4 Nov 2012 03:59:08 +0000 (03:59 +0000)]
vocenc: abort if unsupported codec is used

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agotransform: give avfilter_transform() a return value for returning an error
Michael Niedermayer [Wed, 31 Oct 2012 23:41:46 +0000 (00:41 +0100)]
transform: give avfilter_transform() a return value for returning an error

Fixes CID703674
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agomovenc: remove unneeded check
Michael Niedermayer [Sat, 3 Nov 2012 23:56:57 +0000 (00:56 +0100)]
movenc: remove unneeded check

Fixes CID741417
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agocook: fix use of uninitialized variable
Michael Niedermayer [Sat, 3 Nov 2012 23:51:37 +0000 (00:51 +0100)]
cook: fix use of uninitialized variable

Fixes CID741418
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavfi/earwax: add missing NULL check in filter_samples()
Stefano Sabatini [Sat, 3 Nov 2012 23:17:27 +0000 (00:17 +0100)]
lavfi/earwax: add missing NULL check in filter_samples()

7 years agoadd tools/fourcc2pixfmt to .gitignore
Stefano Sabatini [Sat, 3 Nov 2012 22:40:28 +0000 (23:40 +0100)]
add tools/fourcc2pixfmt to .gitignore

7 years agolavc/xfaceenc: prefer do{}while() over for(){} construct in xface_encode_frame()...
Stefano Sabatini [Sat, 3 Nov 2012 22:26:43 +0000 (23:26 +0100)]
lavc/xfaceenc: prefer do{}while() over for(){} construct in xface_encode_frame() loop

Slightly simplify readability, since the initial check is unnecessary.

7 years agofate: add filmstrip test
Michael Niedermayer [Sat, 3 Nov 2012 21:47:14 +0000 (22:47 +0100)]
fate: add filmstrip test

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoamr_decode_fix_avctx should not return value
Xidorn Quan [Sat, 3 Nov 2012 10:33:58 +0000 (18:33 +0800)]
amr_decode_fix_avctx should not return value

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolswr/swresample: adopt globally consistent rules for options help message
Stefano Sabatini [Sat, 3 Nov 2012 16:01:56 +0000 (17:01 +0100)]
lswr/swresample: adopt globally consistent rules for options help message

The help text tells what the option does, not what the accepted parameter
is. Thus convert strings of the kind:

Bikeshed Color
to
set bikeshed color

7 years agolavc/options_table: force non-negative bitrate range
Stefano Sabatini [Sat, 3 Nov 2012 16:01:08 +0000 (17:01 +0100)]
lavc/options_table: force non-negative bitrate range

It does not make sense to set a negative bitrate.

7 years agocrystalhd: fix missing braces warning
Michael Niedermayer [Sat, 3 Nov 2012 19:21:57 +0000 (20:21 +0100)]
crystalhd: fix missing braces warning

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoavstring: fix compiler warning about freeing const pointers
Michael Niedermayer [Sat, 3 Nov 2012 19:10:30 +0000 (20:10 +0100)]
avstring: fix compiler warning about freeing const pointers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agodoc/faq: make the -sameq question more explicit.
Nicolas George [Sat, 3 Nov 2012 16:13:44 +0000 (17:13 +0100)]
doc/faq: make the -sameq question more explicit.

Wording suggested by Stefano Sabatini, should have been
merged with the previous commit.

7 years agodoc/faq: explain why -sameq is gone.
Nicolas George [Fri, 2 Nov 2012 14:50:23 +0000 (15:50 +0100)]
doc/faq: explain why -sameq is gone.

7 years agowestwood_aud: remove stale comment
Paul B Mahol [Sat, 3 Nov 2012 14:54:17 +0000 (14:54 +0000)]
westwood_aud: remove stale comment

Signed-off-by: Paul B Mahol <onemda@gmail.com>
7 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 3 Nov 2012 13:47:50 +0000 (14:47 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc: add apidoc target for doxygen API documentation
  matroskadec: do not use avpacket internals

Conflicts:
doc/Makefile
libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f'
Michael Niedermayer [Sat, 3 Nov 2012 13:23:36 +0000 (14:23 +0100)]
Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f'

* commit '9221efef7968463f3e3d9ce79ea72eaca082e73f':
  lavf: fix av_interleaved_write_frame() doxy.
  lavf: clarify the lifetime of demuxed packets.
  avconv: do not free muxed packet on streamcopy.
  crc: move doxy to the header
  vf_drawtext: do not use deprecated av_tree_node_size
  x86: Refactor PSWAPD fallback implementations and port to cpuflags

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoMerge commit '9a07c1332cfe092b57b5758f22b686ca58806c60'
Michael Niedermayer [Sat, 3 Nov 2012 13:13:45 +0000 (14:13 +0100)]
Merge commit '9a07c1332cfe092b57b5758f22b686ca58806c60'

* commit '9a07c1332cfe092b57b5758f22b686ca58806c60':
  parser: Move Doxygen documentation to the header files
  PGS subtitles: Expose forced flag
  x86: PMINUB: port to cpuflags

Conflicts:
libavcodec/avcodec.h
libavcodec/pgssubdec.c
libavcodec/version.h
libavcodec/x86/ac3dsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavu/opt: set sample format default value, and accept NULL value
Stefano Sabatini [Sat, 3 Nov 2012 12:51:53 +0000 (13:51 +0100)]
lavu/opt: set sample format default value, and accept NULL value

Fix commit c9eaa98a3e0b1db75680f9ea28e01f21cada1dc3.
+10l.

7 years agoMerge commit '9ce02e14f01de50fcc6f7f459544b140be66d615'
Michael Niedermayer [Sat, 3 Nov 2012 12:38:38 +0000 (13:38 +0100)]
Merge commit '9ce02e14f01de50fcc6f7f459544b140be66d615'

* commit '9ce02e14f01de50fcc6f7f459544b140be66d615':
  x86: ac3dsp: port to cpuflags
  x86util: Add cpuflags_mmxext alias for cpuflags_mmx2
  x86inc: Only define program_name if the macro is unset

Conflicts:
libavcodec/x86/ac3dsp.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
7 years agolavc/options_table: make "request_sample_fmt" an AV_OPT_TYPE_SAMPLE_FMT option
Stefano Sabatini [Fri, 2 Nov 2012 13:28:41 +0000 (14:28 +0100)]
lavc/options_table: make "request_sample_fmt" an AV_OPT_TYPE_SAMPLE_FMT option

Simplify, increase robustness in case a new sample format is added.

7 years agolavu/opt: prefer if(){}else{} over if()else{} construct
Stefano Sabatini [Fri, 2 Nov 2012 14:55:42 +0000 (15:55 +0100)]
lavu/opt: prefer if(){}else{} over if()else{} construct

Improve consistency.

7 years agolavu/opt: add AV_OPT_SAMPLE_FMT option
Stefano Sabatini [Fri, 2 Nov 2012 13:17:17 +0000 (14:17 +0100)]
lavu/opt: add AV_OPT_SAMPLE_FMT option

7 years agolswr/swresample.h: use consistent inclusion guard header name
Stefano Sabatini [Fri, 2 Nov 2012 12:04:14 +0000 (13:04 +0100)]
lswr/swresample.h: use consistent inclusion guard header name

7 years agoffmpeg: complain loudly and exit in case removed -sameq option is specified
Stefano Sabatini [Fri, 2 Nov 2012 11:57:15 +0000 (12:57 +0100)]
ffmpeg: complain loudly and exit in case removed -sameq option is specified

This is better than silently ignoring the option, which results in
unexpected quality results.

7 years agodoc/ffmpeg: remove -debug option description
Stefano Sabatini [Fri, 2 Nov 2012 00:21:05 +0000 (01:21 +0100)]
doc/ffmpeg: remove -debug option description

The option belongs to libavcodec, so it results duplicated in the file.

7 years agoasfdec: check stream_index for validity
Michael Niedermayer [Sat, 3 Nov 2012 04:58:12 +0000 (05:58 +0100)]
asfdec: check stream_index for validity

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoasfdec: flip the interpretation of the header aspect back
Michael Niedermayer [Sat, 3 Nov 2012 04:39:19 +0000 (05:39 +0100)]
asfdec: flip the interpretation of the header aspect back

This reverts 2de88776892093b10522152f1f72b7dfc0320502

Fixes Ticket 1883

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoasfdec: parse aspect ratio payload extension
Michael Niedermayer [Sat, 3 Nov 2012 04:38:12 +0000 (05:38 +0100)]
asfdec: parse aspect ratio payload extension

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoasfdec: correctly parse payload extensions
Michael Niedermayer [Sat, 3 Nov 2012 04:37:18 +0000 (05:37 +0100)]
asfdec: correctly parse payload extensions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agoasfdec: parse payload extension list
Michael Niedermayer [Sat, 3 Nov 2012 04:35:35 +0000 (05:35 +0100)]
asfdec: parse payload extension list

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
7 years agovf_tinterlace: check av_image_get_linesize() return value
Michael Niedermayer [Sat, 3 Nov 2012 01:21:49 +0000 (02:21 +0100)]
vf_tinterlace: check av_image_get_linesize() return value

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