]>
git.sesse.net Git - ffmpeg/log
rogerdpack [Mon, 15 Oct 2012 17:26:07 +0000 (11:26 -0600)]
docu: add flite ffmpeg example
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
rogerdpack [Mon, 15 Oct 2012 17:24:08 +0000 (11:24 -0600)]
docu: fix flite example
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Tomas Härdin [Mon, 15 Oct 2012 15:15:37 +0000 (17:15 +0200)]
dv: Set FS flag from AVFrame.top_field_first
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Tomas Härdin [Mon, 15 Oct 2012 14:24:39 +0000 (16:24 +0200)]
dvdec: Set top_field_first from FS flag
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Tomas Härdin [Mon, 15 Oct 2012 14:13:18 +0000 (16:13 +0200)]
dvdec: Move the VSC pack parsing to before avctx->execute()
This allows the next commit to parse the FS flag.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Tim Nicholson [Mon, 15 Oct 2012 08:47:38 +0000 (09:47 +0100)]
rawdec.c: Extract interlace information from quicktime flag if it exisits.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 15 Oct 2012 15:59:53 +0000 (15:59 +0000)]
flvdec: check return value of create_stream()
Fixes null pointer dereference. Fixes CID732242.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 15 Oct 2012 15:48:13 +0000 (15:48 +0000)]
idcin: check chunk_size value before using it
Fixes integer overflow. Fixes CID732223.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 15 Oct 2012 14:53:56 +0000 (14:53 +0000)]
img2dec: check return value of av_new_packet()
Fixes CID703626.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 15 Oct 2012 13:43:33 +0000 (13:43 +0000)]
h264: use designated initializers for AVClass
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Stefano Sabatini [Mon, 15 Oct 2012 13:34:36 +0000 (15:34 +0200)]
examples/muxing: provide more information in case of avcodec_open2 failure
Stefano Sabatini [Mon, 15 Oct 2012 13:33:58 +0000 (15:33 +0200)]
examples/muxing: add missing error checks
Stefano Sabatini [Mon, 15 Oct 2012 13:20:35 +0000 (15:20 +0200)]
examples/muxing: fix case inconsistency in message
Paul B Mahol [Mon, 15 Oct 2012 13:28:23 +0000 (13:28 +0000)]
xbmenc: cosmetics: reindent
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Mon, 15 Oct 2012 13:26:47 +0000 (13:26 +0000)]
flacdec: replace -1 with AV_SAMPLE_FMT_NONE
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Mon, 15 Oct 2012 12:57:07 +0000 (14:57 +0200)]
movenc: fix tmcd parameters
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 15 Oct 2012 12:26:32 +0000 (14:26 +0200)]
shorten: fix U8 to be planar too
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 15 Oct 2012 12:08:24 +0000 (12:08 +0000)]
smacker: return more meaningfull error codes
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Mon, 15 Oct 2012 12:04:35 +0000 (14:04 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
swscale: try to use mmap only if available
configure: check for mprotect
wmapro: use planar sample format
wmalossless: output in planar sample format
wmadec: use float planar sample format output
shorten: use planar sample format
lavc: update documentation for AVFrame.extended_data
Conflicts:
libavcodec/shorten.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Mon, 15 Oct 2012 08:11:24 +0000 (08:11 +0000)]
lavf/txd: cosmetics: fix identation
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Clément Bœsch [Wed, 10 Oct 2012 12:32:43 +0000 (14:32 +0200)]
lavf/mkv: avoid negative ts by default.
This fixes playback in some circumstances (like webm in firefox).
Regression after
2c34367b .
It is also matching the Matroska specifications:
http://matroska.org/technical/specs/notes.html, "The quick eye will
notice that if a Cluster's Timecode is set to zero, it is possible to
have Blocks with a negative Raw Timecode. Blocks with a negative Raw
Timecode are not valid."
Stefano Sabatini [Sat, 13 Oct 2012 16:43:39 +0000 (18:43 +0200)]
tests: add fate-xface test
Stefano Sabatini [Wed, 25 Jul 2012 10:23:31 +0000 (12:23 +0200)]
lavc: add xface image decoder and encoder
Based on libcompface code by James Ashton <James.Ashton@anu.edu.au>, and
relicensed to LGPL with the author's consent.
Mans Rullgard [Sat, 13 Oct 2012 16:00:16 +0000 (16:00 +0000)]
swscale: try to use mmap only if available
Some systems, e.g. Minix, have sys/mman.h defining MAP_ANONYMOUS without
providing (working) mmap and friends. The mmx filter generation code
checks only for MAP_ANONYMOUS, not for availability of mmap itself which
leads to build errors on aforementioned systems.
This changes the conditional compilation to use mmap only if all the
required functions are available.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sat, 13 Oct 2012 02:40:48 +0000 (02:40 +0000)]
configure: check for mprotect
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Mon, 15 Oct 2012 01:22:00 +0000 (03:22 +0200)]
h264: Change asserts to av_asserts in ff_h264_fill_default_ref_list()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 15 Oct 2012 01:18:08 +0000 (03:18 +0200)]
j2kenc: remove unneeded dereference
Fixes CID703723
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 14 Oct 2012 22:14:43 +0000 (00:14 +0200)]
ffmpeg: use framerate not fieldrate as filter input.
Fixes a problem described in Ticket1065
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 14 Oct 2012 21:40:14 +0000 (23:40 +0200)]
ffplay: Prevent 0/0 aspect from being passed on to lavfi
0/0 fails to be parsed
Fixes Ticket1814
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Wed, 29 Aug 2012 02:49:17 +0000 (22:49 -0400)]
wmapro: use planar sample format
Justin Ruggles [Sat, 25 Aug 2012 23:09:40 +0000 (19:09 -0400)]
wmalossless: output in planar sample format
Justin Ruggles [Wed, 29 Aug 2012 03:12:49 +0000 (23:12 -0400)]
wmadec: use float planar sample format output
Justin Ruggles [Tue, 28 Aug 2012 18:02:41 +0000 (14:02 -0400)]
shorten: use planar sample format
Michael Niedermayer [Sun, 14 Oct 2012 20:13:37 +0000 (22:13 +0200)]
j2kdec: remove unneeded operation
Fixes CID717554
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 14 Oct 2012 20:11:38 +0000 (22:11 +0200)]
j2kdec: make curtilenum integer.
This fixes a potential crash.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 14 Oct 2012 20:00:04 +0000 (22:00 +0200)]
tag_tree_decode: check node being non null
Fixes CID717843
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 14 Oct 2012 19:53:29 +0000 (21:53 +0200)]
compute_lpc_coefs: assert that normalize and fail have a supported combination
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 14 Oct 2012 19:45:42 +0000 (21:45 +0200)]
noise_bsf: fix division by 0
Fixes CID733737
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Justin Ruggles [Sun, 14 Oct 2012 18:31:47 +0000 (14:31 -0400)]
lavc: update documentation for AVFrame.extended_data
Michael Chinen [Sun, 14 Oct 2012 07:08:43 +0000 (16:08 +0900)]
flac_parser.c: fix issue with looping output for small files.
see trac 1345
https://ffmpeg.org/trac/ffmpeg/ticket/1345
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Thilo Borgmann [Sun, 14 Oct 2012 15:38:21 +0000 (17:38 +0200)]
bgmc: fix sizeof arguments (should fix CIDs: 700724 and 608084)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 14 Oct 2012 16:53:05 +0000 (18:53 +0200)]
lavf: fix fps detection with PAFF H.264
Fixes Ticket1065
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Hendrik Leppkes [Sun, 14 Oct 2012 08:03:07 +0000 (10:03 +0200)]
h264: fix parsing of old lossless profile (profile_idc == 144)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sun, 14 Oct 2012 11:11:42 +0000 (22:11 +1100)]
eatgq: raise error on unsupported macroblock mode
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Sun, 14 Oct 2012 10:50:09 +0000 (21:50 +1100)]
ansi: by design nb_args may exceed the size of the args array, so guard accordingly
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 14 Oct 2012 13:11:34 +0000 (15:11 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avutil: Do not make ff_ symbols globally visible.
avutil: Rename ff_set_systematic_pal2() ---> avpriv_set_systematic_pal2()
build: tms470: work around glibc math.h problems
configure: improve tms470 compiler usage with glibc
Conflicts:
libavcodec/bmpenc.c
libavcodec/rawdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 14 Oct 2012 12:54:10 +0000 (12:54 +0000)]
eatgq: fix small overread
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sun, 14 Oct 2012 12:38:03 +0000 (14:38 +0200)]
Merge commit '
b5198a2637b7b45b0049a1d4b386a06f016f2520 '
* commit '
b5198a2637b7b45b0049a1d4b386a06f016f2520 ':
configure: tms470: add mapping for -mfpu=vfpv3-d16 flag
configure: recognise Minix as OS
configure: work around bug in ash shell
eval-test: make table static const
lavr: handle clipping in the float to s32 conversion
nut: support pcm codecs not mapped in avi
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 14 Oct 2012 12:30:06 +0000 (14:30 +0200)]
Merge commit '
1bd442c276e6688b43777a198cad0d7e3a92123f '
* commit '
1bd442c276e6688b43777a198cad0d7e3a92123f ':
nut: prioritize native tags
Conflicts:
tests/ref/lavfi/crop
tests/ref/lavfi/crop_scale
tests/ref/lavfi/crop_scale_vflip
tests/ref/lavfi/crop_vflip
tests/ref/lavfi/null
tests/ref/lavfi/pixdesc
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_crop
tests/ref/lavfi/pixfmts_hflip
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_pad
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip
tests/ref/lavfi/scale200
tests/ref/lavfi/scale500
tests/ref/lavfi/vflip
tests/ref/lavfi/vflip_crop
tests/ref/lavfi/vflip_vflip
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 14 Oct 2012 12:05:41 +0000 (14:05 +0200)]
doc/nut: Clarify what/where is the official nut specification
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sun, 14 Oct 2012 10:37:18 +0000 (10:37 +0000)]
wv: do not report invalid stream duration
If total number of samples is -1 it means stream is of unknown length.
Fixes ticket #1777.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 14 Oct 2012 09:21:48 +0000 (09:21 +0000)]
svq1dec: use log level that have more common sense
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 14 Oct 2012 09:18:36 +0000 (09:18 +0000)]
svq1dec: use more common way to check if result is not zero
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 14 Oct 2012 09:14:35 +0000 (09:14 +0000)]
svq1dec: check return value of get_bits1() in more common way
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sun, 14 Oct 2012 09:12:19 +0000 (09:12 +0000)]
svq1dec: return more meaningful error codes
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sun, 14 Oct 2012 03:49:10 +0000 (05:49 +0200)]
mp3enc: fix signed C99 overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 14 Oct 2012 03:48:02 +0000 (05:48 +0200)]
dpxenc: fix signed c99 overflows
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 14 Oct 2012 03:16:59 +0000 (05:16 +0200)]
sws: get rid of C99 signed overflows try #2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 14 Oct 2012 02:01:41 +0000 (04:01 +0200)]
paf: avoid C99 overflows
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 14 Oct 2012 01:59:45 +0000 (03:59 +0200)]
sws: avoid signed C99 overflows
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 14 Oct 2012 01:48:05 +0000 (03:48 +0200)]
swr/rematrix: fix C99 left shift overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 14 Oct 2012 01:42:28 +0000 (03:42 +0200)]
g723_1: fix overflow in square_root()
the intermediate does not fit in a signed 32bit int
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 14 Oct 2012 01:34:16 +0000 (03:34 +0200)]
avoid more "0xFF << 24" as it is considered a integer overflow in C99
missed these in my previous search and replace
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 14 Oct 2012 01:17:13 +0000 (03:17 +0200)]
avoid "0xFF << 24" as it is considered a integer overflow in C99
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 14 Oct 2012 01:02:33 +0000 (03:02 +0200)]
mpeg4videodec: Recalculate timebase in case of guessing time increment bits
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sun, 14 Oct 2012 00:09:05 +0000 (02:09 +0200)]
lavfi/select/scene: use pointer increments instead of y*linesize.
Clément Bœsch [Sat, 13 Oct 2012 16:19:29 +0000 (18:19 +0200)]
lavfi/select/scene: fix potential overread.
Also make sure we use the actual width of the image and not the whole
linesize.
Clément Bœsch [Sat, 13 Oct 2012 16:10:28 +0000 (18:10 +0200)]
lavfi/select/scene: move out convoluted sad variable init from loop.
Thilo Borgmann [Sat, 13 Oct 2012 20:58:55 +0000 (22:58 +0200)]
alsdec: fix clipping of weightings for MCC decoding
Fixes CID717905
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 13 Oct 2012 21:52:55 +0000 (23:52 +0200)]
mpegvideo: fix motion_val checks
Fixes CID604124
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 13 Oct 2012 21:48:00 +0000 (23:48 +0200)]
mpegvideo: check return value of ff_MPV_common_init()
Fixes CID703621
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 13 Oct 2012 21:41:10 +0000 (23:41 +0200)]
avcodec_find_best_pix_fmt_of_2: fix handling or PIX_FMT_NONE
Fixes CID733775
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 13 Oct 2012 20:48:32 +0000 (22:48 +0200)]
flashsv: check deflateInit() return value
Fixes CID703620
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 13 Oct 2012 20:40:14 +0000 (22:40 +0200)]
dnxhdenc: assert ff_dnxhd_get_cid_table() return value
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 13 Oct 2012 20:36:15 +0000 (22:36 +0200)]
dnxhddata_ Fix mixup of sizeof() and array elements in ff_dnxhd_find_cid()
Fixes CID717910
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 13 Oct 2012 20:33:40 +0000 (22:33 +0200)]
ffv1: make sure gob_count is not 0
Fixes division by 0
Fixes CID733736
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 13 Oct 2012 19:19:52 +0000 (21:19 +0200)]
sws-test: raise limigts a bit.
these cases arent used but theres no point in failing on them
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 13 Oct 2012 19:09:42 +0000 (21:09 +0200)]
pp: avoid overflow in w*h
Fixes CID700580
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 13 Oct 2012 19:05:13 +0000 (21:05 +0200)]
sws-test: check W/H
Fixes CID733834
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 13 Oct 2012 18:48:48 +0000 (18:48 +0000)]
lavc/codec_desc: add/update properties of some codecs
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sat, 13 Oct 2012 18:10:29 +0000 (20:10 +0200)]
ffeval: avoid folding EOF onto a valid char
Fixes CID733704
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 13 Oct 2012 17:58:44 +0000 (19:58 +0200)]
probetest: check command line arguments
Fixes CID733835
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 13 Oct 2012 17:46:53 +0000 (19:46 +0200)]
trasher: check seek return value.
Fixes CID733726
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 4 Oct 2012 17:20:03 +0000 (19:20 +0200)]
avutil: Do not make ff_ symbols globally visible.
Paul B Mahol [Sat, 13 Oct 2012 18:00:48 +0000 (18:00 +0000)]
xbmdec: s/av_reverse/ff_reverse
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diego Biurrun [Thu, 4 Oct 2012 19:15:51 +0000 (21:15 +0200)]
avutil: Rename ff_set_systematic_pal2() ---> avpriv_set_systematic_pal2()
Functions used across libraries should have avpriv_ and not ff_ prefixes.
Mans Rullgard [Sat, 13 Oct 2012 00:34:42 +0000 (01:34 +0100)]
configure: tms470: add mapping for -mfpu=vfpv3-d16 flag
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sat, 13 Oct 2012 02:16:13 +0000 (03:16 +0100)]
build: tms470: work around glibc math.h problems
The glibc definitions of INFINITY and NAN do not work with the
tms470 compiler, nor do our usual fallbacks.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Mans Rullgard [Sat, 13 Oct 2012 01:28:41 +0000 (02:28 +0100)]
configure: improve tms470 compiler usage with glibc
Apply flags to work around glibc quirks only if glibc is detected,
and add a few more such flags.
Do not mess with as/ld settings in probe_cc. This is not the
proper place.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Michael Niedermayer [Sat, 13 Oct 2012 16:16:34 +0000 (18:16 +0200)]
libavutil: loose idiotic circular dependancies between version and avutil.h
This fixes the recently appearing PIX_FMT warnings
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Dmitry Samonenko [Sat, 13 Oct 2012 15:03:33 +0000 (19:03 +0400)]
sdp: output speex optional vbr parameter
Optional sdp speex payload parameter is outputed only when
data is encoded. It's not printed in case of stream copy.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 13 Oct 2012 16:46:42 +0000 (18:46 +0200)]
tests: fix checksums for png aspect ratio change
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 13 Oct 2012 08:12:50 +0000 (08:12 +0000)]
lavc: return s->get_buffer() error code if it errors out
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 13 Oct 2012 09:26:09 +0000 (09:26 +0000)]
pngenc: write sample aspect ratio
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Sat, 13 Oct 2012 08:38:02 +0000 (08:38 +0000)]
pngdec: read sample aspect ratio
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sat, 13 Oct 2012 15:09:13 +0000 (17:09 +0200)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vc1: Use codec ID from AVCodecContext while parsing frame header
avplay: support mid-stream sample rate changes
Conflicts:
ffplay.c
libavcodec/vc1.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 13 Oct 2012 14:45:01 +0000 (16:45 +0200)]
ffplay: use audio parameters from the decoded frame instead of AVCodecContext
Based on commit by Justin Ruggles (the changed code is too different to apply as is)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 13 Oct 2012 14:39:42 +0000 (16:39 +0200)]
Merge commit '
f5962229bfcb14c2879e69ccdf7f1a4934168609 '
* commit '
f5962229bfcb14c2879e69ccdf7f1a4934168609 ':
avplay: use audio parameters from the decoded frame instead of AVCodecContext
dca: allocate a secondary buffer for extra channels when downmixing
configure: use utilities from /usr/xpg4/bin if it exists
avstring-test: fix memory leaks
Conflicts:
ffplay.c
libavcodec/dcadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Sat, 13 Oct 2012 14:09:20 +0000 (14:09 +0000)]
smjpegdec: use url_feof()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Sat, 13 Oct 2012 13:42:49 +0000 (15:42 +0200)]
Merge commit '
0a7005bebd23ade7bb852bce0401af1a8fdbb723 '
* commit '
0a7005bebd23ade7bb852bce0401af1a8fdbb723 ':
rtpdec_xiph: fix function return type
smjpeg: fix type of 'ret' variable in smjpeg_read_packet()
mpegvideo: remove write-only variable
Use proper return values in case of missing features
fate: add avstring test
rangecoder-test: Set error message log level to error, instead of debug
Conflicts:
libavcodec/aacdec.c
libavcodec/amrnbdec.c
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>