]>
git.sesse.net Git - ffmpeg/log
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>
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>
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>
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>
Clément Bœsch [Sun, 4 Nov 2012 22:22:28 +0000 (23:22 +0100)]
lavf/srtdec: recognize subtitles starting at event index 0.
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.
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Stefano Sabatini [Sun, 4 Nov 2012 11:05:30 +0000 (12:05 +0100)]
lavu: drop disabled FF_API_OLD_TC_ADJUST_FRAMENUM code
Stefano Sabatini [Sun, 4 Nov 2012 14:50:52 +0000 (15:50 +0100)]
doc/libavcodec: apply misc minor typo fixes
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.
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>
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>
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>
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
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>
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>
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>
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.
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.
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.
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.
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.
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>
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>
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>
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>
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>
Stefano Sabatini [Sat, 3 Nov 2012 23:17:27 +0000 (00:17 +0100)]
lavfi/earwax: add missing NULL check in filter_samples()
Stefano Sabatini [Sat, 3 Nov 2012 22:40:28 +0000 (23:40 +0100)]
add tools/fourcc2pixfmt to .gitignore
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.
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>
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>
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
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.
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>
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>
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.
Nicolas George [Fri, 2 Nov 2012 14:50:23 +0000 (15:50 +0100)]
doc/faq: explain why -sameq is gone.
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>
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>
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>
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>
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.
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>
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.
Stefano Sabatini [Fri, 2 Nov 2012 14:55:42 +0000 (15:55 +0100)]
lavu/opt: prefer if(){}else{} over if()else{} construct
Improve consistency.
Stefano Sabatini [Fri, 2 Nov 2012 13:17:17 +0000 (14:17 +0100)]
lavu/opt: add AV_OPT_SAMPLE_FMT option
Stefano Sabatini [Fri, 2 Nov 2012 12:04:14 +0000 (13:04 +0100)]
lswr/swresample.h: use consistent inclusion guard header name
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.
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.
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>
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>
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>
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>
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>
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>
Michael Niedermayer [Sat, 3 Nov 2012 01:09:43 +0000 (02:09 +0100)]
af_earwax: remove unused pointer value
Fixes CID703849
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Nov 2012 23:40:19 +0000 (00:40 +0100)]
libgsmdec: fix decoding of non 8khz gsm files
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Nov 2012 23:39:46 +0000 (00:39 +0100)]
gsmdec: fix decoding of non 8khz gsm files
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 2 Nov 2012 23:39:03 +0000 (23:39 +0000)]
indeo3: release buffer before calling decode_plane
Paul B Mahol [Tue, 30 Oct 2012 12:10:40 +0000 (12:10 +0000)]
Revert "Partly revert
f174fba : indeo3 decoder does not support direct rendering."
f174fba did not introduce DR1 flag it was already available before that.
This reverts commit
8bf44d5c9681233f5c1fd353b18276f25b199b7a .
Michael Niedermayer [Fri, 2 Nov 2012 22:47:32 +0000 (23:47 +0100)]
libvo-amrwbenc: allow sampling rates other than 16khz
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Nov 2012 22:47:12 +0000 (23:47 +0100)]
libopencore-amr: allow sampling rates other than 8khz
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Nov 2012 22:46:47 +0000 (23:46 +0100)]
libopencore-amrdec: allow sampling rates other than 8khz
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Nov 2012 22:46:19 +0000 (23:46 +0100)]
amrwbdec: allow sample rates other than 16khz
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Nov 2012 22:45:54 +0000 (23:45 +0100)]
amrnbdec: allow sample rates other than 8khz
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 2 Nov 2012 21:54:44 +0000 (21:54 +0000)]
lclenc: make compression level user selectable
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Heesuk Jung [Fri, 2 Nov 2012 15:25:03 +0000 (08:25 -0700)]
Fix bit_rate in MPEG1/2 Video
In ISO/IEC 13818-2, bit rate is differently determined according to video type
1) MPEG1 Video
Bit_rate and vbv_delay are set to 3FFFF and FFFF respectively
to indicate variable bitrate. Other values are for constant bitrate.
VBV is only defined for constant bit rate operation.
Ths STD supersedes the VBV model for vbr.
2) MPEG2 Video
Even if the bitrate is constant, the value of bit_rate may not be the actual bitrate
since bit_rate need only be an upper bound to that actual bitrate.
VBV is only defined for variable bit rate operation.
Constant bit rate is viewed as a special case of vbr.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 2 Nov 2012 19:44:49 +0000 (19:44 +0000)]
apedec: consume packet after it has been fully decoded
Timestamp handling of decoded frames are much simpler now.
Fixes #1675.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Janne Grunau [Mon, 29 Oct 2012 15:26:59 +0000 (16:26 +0100)]
doc: add apidoc target for doxygen API documentation
Documentation includes only the externally visible API of the installed
headers.
Based on a patch by Anton Khirnov <anton@khirnov.net>.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Anton Khirnov [Wed, 31 Oct 2012 15:54:16 +0000 (16:54 +0100)]
lavf: fix av_interleaved_write_frame() doxy.
A sentence was mistakenly inserted in the middle of another sentence.
Anton Khirnov [Thu, 1 Nov 2012 05:34:41 +0000 (06:34 +0100)]
matroskadec: do not use avpacket internals
Anton Khirnov [Wed, 31 Oct 2012 18:59:53 +0000 (19:59 +0100)]
lavf: clarify the lifetime of demuxed packets.
Anton Khirnov [Wed, 31 Oct 2012 20:15:41 +0000 (21:15 +0100)]
avconv: do not free muxed packet on streamcopy.
The packet belongs to lavf, the caller must not free it or access it in
any other way.
No change in practice, since destruct is set to NULL anyway.
Anton Khirnov [Fri, 2 Nov 2012 09:58:36 +0000 (10:58 +0100)]
crc: move doxy to the header
Anton Khirnov [Fri, 2 Nov 2012 09:56:30 +0000 (10:56 +0100)]
vf_drawtext: do not use deprecated av_tree_node_size
Paul B Mahol [Fri, 2 Nov 2012 16:21:17 +0000 (16:21 +0000)]
smjpegdec: set nb_frames for video stream
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diego Biurrun [Wed, 1 Aug 2012 22:55:34 +0000 (00:55 +0200)]
x86: Refactor PSWAPD fallback implementations and port to cpuflags
Diego Biurrun [Fri, 2 Nov 2012 11:04:16 +0000 (12:04 +0100)]
parser: Move Doxygen documentation to the header files
John Stebbins [Sat, 20 Oct 2012 16:56:11 +0000 (09:56 -0700)]
PGS subtitles: Expose forced flag
Useful for detection of subtitles displayed during foreign language
scenes.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diego Biurrun [Sun, 15 Jul 2012 15:43:50 +0000 (17:43 +0200)]
x86: PMINUB: port to cpuflags
Diego Biurrun [Sun, 15 Jul 2012 13:41:30 +0000 (15:41 +0200)]
x86: ac3dsp: port to cpuflags
Diego Biurrun [Tue, 30 Oct 2012 00:11:14 +0000 (01:11 +0100)]
x86util: Add cpuflags_mmxext alias for cpuflags_mmx2
"mmxext" is a more sensible name and more common in outside projects.
Nicolas George [Sun, 28 Oct 2012 13:41:40 +0000 (14:41 +0100)]
lavc/pngdec: decode textual data (tEXt and zTXt).
Requested in trac ticket #1857.
Nicolas George [Sun, 28 Oct 2012 13:40:30 +0000 (14:40 +0100)]
lavu/bprint: add av_bprint_get_buffer().
It is useful to use bprint to handle a growing buffer
used with another API.
Michael Niedermayer [Fri, 2 Nov 2012 13:40:04 +0000 (14:40 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dv1394: Swap the min and max values of the 'standard' option
rtpdec_vp8: Don't parse fields that aren't used
lavc: add some AVPacket doxy.
audiointerleave: deobfuscate a function call.
rtpdec: factorize identical code used in several handlers
a64: remove interleaved mode.
doc: Point to the new location of the c99-to-c89 tool
decode_audio3: initialize AVFrame
ws-snd1: set channel layout
wmavoice: set channel layout
wmapro: use AVCodecContext.channels instead of keeping a private copy
wma: do not keep private copies of some AVCodecContext fields
Conflicts:
libavcodec/wmadec.c
libavcodec/wmaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 30 Oct 2012 01:54:25 +0000 (02:54 +0100)]
x86inc: Only define program_name if the macro is unset
This allows overriding the value from outside of the file.
Michael Niedermayer [Fri, 2 Nov 2012 13:15:28 +0000 (14:15 +0100)]
Merge commit '
50a65e7a540ce6747f81d6dbf6a602ad35be77ff '
* commit '
50a65e7a540ce6747f81d6dbf6a602ad35be77ff ': (24 commits)
vmdaudio: set channel layout
twinvq: validate sample rate code
twinvq: set channel layout
twinvq: validate that channels is not <= 0
truespeech: set channel layout
sipr: set channel layout
shorten: validate that the channel count in the header is not <= 0
ra288dec: set channel layout
ra144dec: set channel layout
qdm2: remove unneeded checks for channel count
qdm2: make sure channels is not <= 0 and set channel layout
qcelpdec: set channel layout
nellymoserdec: set channels to 1
libopencore-amr: set channel layout for amr-nb or if not set by the user
libilbc: set channel layout
dpcm: use AVCodecContext.channels instead of keeping a private copy
imc: set channels to 1 instead of validating it
gsmdec: always set channel layout and sample rate at initialization
libgsmdec: always set channel layout and sample rate at initialization
g726dec: do not validate sample rate
...
Conflicts:
libavcodec/dpcm.c
libavcodec/qdm2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 2 Nov 2012 13:00:23 +0000 (14:00 +0100)]
pcm: fix handling of more than 8 channels for planar
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>