OSDN Git Service
Michael Niedermayer [Mon, 4 Mar 2013 17:54:00 +0000 (18:54 +0100)]
update_stream_timings: check bitrate for being in range.
Fixes numerical overflow
Fixes Ticket2089
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Mar 2013 17:17:47 +0000 (18:17 +0100)]
dnxhddec: return the correct number of bytes from decode_frame
Fixes Ticket2022
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Mar 2013 17:01:32 +0000 (18:01 +0100)]
avformat: Make duration estimation from pts more robust
Ignore durations which differ significantly from the previous
Fixes Ticket2018
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Mar 2013 15:51:21 +0000 (16:51 +0100)]
nutdec: more specific return codes for decode_syncpoint()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Mar 2013 15:49:17 +0000 (16:49 +0100)]
nutdec: print error on invalid/unsupported fourcc style
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Mon, 4 Mar 2013 13:45:48 +0000 (14:45 +0100)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
buildsys: only include log2_tab per library for shared builds
Add h264chroma dependency for cavs decoder to configure.
Add h264qpel dependency for snow codec to configure.
Add h264chroma dependency for vp5 and vp6 decoder to configure.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Mon, 4 Mar 2013 12:12:25 +0000 (13:12 +0100)]
build: [autodetect] -> [no] in iconv help.
Michael Niedermayer [Mon, 4 Mar 2013 11:25:02 +0000 (12:25 +0100)]
buildsys: only include log2_tab per library for shared builds
Fix linking failures with -all_load due to multiple log2_tabs
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Carl Eugen Hoyos [Mon, 4 Mar 2013 10:43:55 +0000 (11:43 +0100)]
Add h264chroma dependency for cavs decoder to configure.
Fix building for some unusual configurations.
Carl Eugen Hoyos [Mon, 4 Mar 2013 10:43:09 +0000 (11:43 +0100)]
Add h264qpel dependency for snow codec to configure.
Fix building for some unusual configurations.
Carl Eugen Hoyos [Mon, 4 Mar 2013 10:39:44 +0000 (11:39 +0100)]
Add h264chroma dependency for vp5 and vp6 decoder to configure.
Fix building for some unusual configurations.
Clément Bœsch [Mon, 4 Mar 2013 02:37:36 +0000 (03:37 +0100)]
compat/strtod: isspace -> av_isspace.
This should fix build after
88d55b8.
Clément Bœsch [Sun, 3 Mar 2013 21:48:16 +0000 (22:48 +0100)]
build: disable iconv by default.
It seems to break a lot on MacOS because of a mixup between multiple
iconv libraries. The issue is that the configure check link with no
particular library path (so it uses /usr/lib/libiconv.dylib where all
the symbols are defined). OTOH, the final build might link with extra
library paths, such as the ports lib directory (typically you get
-L/opt/local/lib because of an extra library such as SDL). Whatever this
option position (before or after -liconv), it will try to link with
/opt/local/lib/libiconv.dylib, and the issue is that this version has
the same symbols as the ones in /usr/lib/libiconv.dylib except that they
all start with 'lib' (libiconv_open, libiconv_close, ...). I don't plan
to try to workaround this mess, so any better solution is welcome.
Clément Bœsch [Sun, 3 Mar 2013 22:49:46 +0000 (23:49 +0100)]
doc/filters: fix degrees/radians copy/paste fail.
Michael Niedermayer [Sun, 3 Mar 2013 21:02:22 +0000 (22:02 +0100)]
ffmpeg_opt: Ask for overwrite in single image2 files too
Fixes Ticket1637
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Sun, 3 Mar 2013 21:06:48 +0000 (22:06 +0100)]
lavfi/opencv: isgraph -> av_isgraph.
Fix build after
88d55b8.
Reimar Döffinger [Sun, 3 Mar 2013 10:17:50 +0000 (11:17 +0100)]
Remove incorrect use of ctype.h functions.
As far as I can tell the code should not change behaviour
depending on locale in any of these places.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Ronald S. Bultje [Sun, 3 Mar 2013 16:23:08 +0000 (08:23 -0800)]
Deprecate deinterlaced in libavcodec.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 Mar 2013 18:33:37 +0000 (19:33 +0100)]
ffmpeg: fix -stats -v 0
Fixes Ticket1687
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 Mar 2013 17:41:16 +0000 (18:41 +0100)]
avformat: gather aspect ratio from rv30/40 in find_stream_info
Fixes Ticket1550
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 Mar 2013 17:14:08 +0000 (18:14 +0100)]
rv34: fix aspect ratio
Fixes part of Ticket1550
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 Mar 2013 15:50:47 +0000 (16:50 +0100)]
wmadec: check nb_frames
Improves error message for Ticket968
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sun, 3 Mar 2013 13:04:48 +0000 (14:04 +0100)]
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
movenc: Do not flag secondary audio and subtitle tracks as enabled.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sun, 3 Mar 2013 01:03:38 +0000 (17:03 -0800)]
h264: put call to ff_print_debug_info2 under CONFIG_MPEGVIDEO.
The code is located in mpegvideo, and it's likely that in a minimal
config, we don't want to include debug info anyway.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sun, 3 Mar 2013 00:57:26 +0000 (16:57 -0800)]
h264: make it possible to compile without error_resilience.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Mar 2013 14:57:48 +0000 (15:57 +0100)]
movenc: Do not flag secondary audio and subtitle tracks as enabled.
Fixes ticket #468 and ticket #1174.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Michael Niedermayer [Sun, 3 Mar 2013 10:40:29 +0000 (11:40 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtpdec: Initialize some variables to silence compiler warnings
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Ronald S. Bultje [Sat, 2 Mar 2013 19:22:02 +0000 (11:22 -0800)]
h264: add a copy of draw_horiz_band.
This makes the decoder independent of mpegvideo.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Mar 2013 19:39:38 +0000 (20:39 +0100)]
libxvid: cleanup on error pathes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Mar 2013 19:32:21 +0000 (20:32 +0100)]
libxvid: check & clear encoder_handle
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Mar 2013 19:29:47 +0000 (20:29 +0100)]
libxvid: use av_freep() for saftey
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Mar 2013 19:22:08 +0000 (20:22 +0100)]
libxvid: remove temporary files at the end
Fixes Ticket924
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Sat, 2 Mar 2013 11:54:50 +0000 (13:54 +0200)]
rtpdec: Initialize some variables to silence compiler warnings
The warnings are false positives, older gcc versions (such as 4.5)
think the variables can be used uninitialized while they in
practice can't, while newer (4.6) gets it right.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Sat, 2 Mar 2013 18:07:41 +0000 (19:07 +0100)]
mjpegdec: fix endiansoup
Fixes Ticket2175
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Sat, 2 Mar 2013 17:37:55 +0000 (18:37 +0100)]
Avoid huge memory allocations from asf demuxer.
Fixes ticket #1888.
James Almer [Sat, 16 Feb 2013 09:07:49 +0000 (06:07 -0300)]
lavc/flacdec: Add frame CRC calculation
Fixes ticket #2266
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Sat, 2 Mar 2013 15:04:49 +0000 (16:04 +0100)]
ffmpeg: print maxrss "-benchmark" data even on errors
Fixes Ticket2297
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 19 Feb 2013 18:58:14 +0000 (19:58 +0100)]
er: Fix slice threading check
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Mar 2013 11:10:52 +0000 (12:10 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: set ref_count to 0 for intra slices.
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Mar 2013 10:53:19 +0000 (11:53 +0100)]
Merge commit '
668e16a0dd1ff56d4beeff5c658d8a2a08dbfac8'
* commit '
668e16a0dd1ff56d4beeff5c658d8a2a08dbfac8':
h264: on reference overflow, reset the reference count to 0, not 1.
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Mar 2013 10:41:31 +0000 (11:41 +0100)]
Merge commit '
e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9'
* commit '
e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9':
h264: do not copy ref count/ref2frm when updating per-frame context
flvdec: Check the return value of a malloc
Conflicts:
libavformat/flvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Sat, 2 Mar 2013 10:27:58 +0000 (11:27 +0100)]
Merge commit '
c91c63b5380bf79655c09320774a022f84d76fd5'
* commit '
c91c63b5380bf79655c09320774a022f84d76fd5':
flvdec: Don't read the VP6 header byte when setting codec type based on metadata
Conflicts:
libavformat/flvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Anton Khirnov [Thu, 14 Feb 2013 10:44:33 +0000 (11:44 +0100)]
h264: set ref_count to 0 for intra slices.
CC:libav-stable@libav.org
Anton Khirnov [Thu, 14 Feb 2013 10:43:20 +0000 (11:43 +0100)]
h264: on reference overflow, reset the reference count to 0, not 1.
Since decode_slice_header() returns before the reference lists are
constructed, there are zero valid references.
CC:libav-stable@libav.org
Anton Khirnov [Thu, 14 Feb 2013 10:41:10 +0000 (11:41 +0100)]
h264: do not copy ref count/ref2frm when updating per-frame context
They are filled in decode_slice_header() anyway.
Michael Niedermayer [Sat, 2 Mar 2013 00:51:29 +0000 (01:51 +0100)]
v4l2: fix regression that caused ffmpeg to occasionally get stuck
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Giorgio Vazzana [Thu, 14 Feb 2013 11:33:49 +0000 (12:33 +0100)]
lavd/v4l2: copy frames into normally allocated packets whenever there is just one buffer left available
This will avoid the possibility that we dequeue more buffers than we
have obtained from the v4l2 driver.
Fixes ticket #1570
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Martin Storsjö [Fri, 1 Mar 2013 14:45:24 +0000 (16:45 +0200)]
flvdec: Check the return value of a malloc
The callers of this function can't report errors sanely. If this
one malloc fails, don't write the extradata byte, make sure we
try to malloc it the next time we're called instead, and make sure
we still consume the input data byte.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Fri, 1 Mar 2013 14:30:44 +0000 (16:30 +0200)]
flvdec: Don't read the VP6 header byte when setting codec type based on metadata
This header byte is only present when actually reading a VP6 frame,
not when reading the codec type field in the metadata. This
potential bug has been present since
5b54a90c.
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Fri, 1 Mar 2013 21:22:48 +0000 (22:22 +0100)]
ffplay: use AVFrame accessor functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 21:26:53 +0000 (22:26 +0100)]
avcodec/utils: use AVFrame accessor functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 21:25:09 +0000 (22:25 +0100)]
avcodec/rawdec: use AVFrame accessor functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 21:24:56 +0000 (22:24 +0100)]
pngdec: use AVFrame accessor functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 21:24:41 +0000 (22:24 +0100)]
gifdec: use AVFrame accessor functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 21:24:30 +0000 (22:24 +0100)]
cpia: use AVFrame accessor functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 21:24:22 +0000 (22:24 +0100)]
tiff: use AVFrame accessor functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 21:23:54 +0000 (22:23 +0100)]
ac3dec: use AVFrame accessor functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 21:23:38 +0000 (22:23 +0100)]
ffprobe: use AVFrame accessor functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 21:03:42 +0000 (22:03 +0100)]
doc/examples/demuxing: use AVFrame accessor functions
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 21:26:12 +0000 (22:26 +0100)]
avcodec: add ff_frame_get_metadatap()
This is needed for av_dict_*
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 1 Mar 2013 15:22:02 +0000 (15:22 +0000)]
lavc/codec_desc: add/fix .props for SGI/DPX/X-face/BRender PIX image
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Joseph Artsimovich [Fri, 1 Mar 2013 13:37:28 +0000 (13:37 +0000)]
Handle an invalid extra mpeg2 picture header following a frame-encoded picture.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 1 Mar 2013 14:54:34 +0000 (14:54 +0000)]
sgidec: use unchecked bytestream2 functions where it makes sense
Overreads can not happen as header size of 512 bytes is required.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Rob Sykes [Fri, 1 Mar 2013 13:29:14 +0000 (14:29 +0100)]
soxr: libsoxr 0.1.1 support
Libsoxr 0.1.1 will be out very soon; no changes planned beyond what's currently in git.
It includes a couple of fixes (not affecting FFmpeg's current usage) and a minor API change (but remains ABI compatible).
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Fri, 1 Mar 2013 13:10:22 +0000 (13:10 +0000)]
exr: use bytestream functions in pxr24_uncompress()
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Michael Niedermayer [Fri, 1 Mar 2013 12:50:05 +0000 (13:50 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lls: Do not return from void functions
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 12:44:27 +0000 (13:44 +0100)]
Merge commit '
4da950c0ae224b9b8ef952dadf614be2c050023e'
* commit '
4da950c0ae224b9b8ef952dadf614be2c050023e':
lls: #ifndef --> #if in FF_API_ version guard
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 12:39:47 +0000 (13:39 +0100)]
Merge commit '
e8c52271c45ec27d783e74238dcfad0c2008731c'
* commit '
e8c52271c45ec27d783e74238dcfad0c2008731c':
Revert "Move H264/QPEL specific asm from dsputil.asm to h264_qpel_*.asm."
Conflicts:
libavcodec/x86/dsputil.asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 12:32:12 +0000 (13:32 +0100)]
Merge commit '
399663be9d4a839b894c48a21b62926eb8497d72'
* commit '
399663be9d4a839b894c48a21b62926eb8497d72':
lls: mark max_order as unsigned short
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 12:19:00 +0000 (13:19 +0100)]
Merge commit '
9d4da474f5f40b019cb4cb931c8499deee586174'
* commit '
9d4da474f5f40b019cb4cb931c8499deee586174':
lls: move to the private namespace
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 12:02:57 +0000 (13:02 +0100)]
Merge commit '
7ac6d2423e9bf0f40c67be9a0ca7600b516b0282'
* commit '
7ac6d2423e9bf0f40c67be9a0ca7600b516b0282':
lls: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 11:55:23 +0000 (12:55 +0100)]
Merge commit '
df0229a7caa124dcfb84c34b48d316744c467311'
* commit '
df0229a7caa124dcfb84c34b48d316744c467311':
avconv: Apply codec options to streams that are copied as well
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Fri, 1 Mar 2013 11:47:53 +0000 (12:47 +0100)]
Merge commit '
cb6f8245aed2c26fe95c30cd68c45983277a945a'
* commit '
cb6f8245aed2c26fe95c30cd68c45983277a945a':
cmdutils: Allow calling filter_codec_opts without a set encoder
pnm: Use av_pix_fmt_desc_get instead of accessing the array directly
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Thu, 28 Feb 2013 20:32:02 +0000 (21:32 +0100)]
lls: Do not return from void functions
Diego Biurrun [Thu, 28 Feb 2013 20:31:26 +0000 (21:31 +0100)]
lls: #ifndef --> #if in FF_API_ version guard
Michael Niedermayer [Thu, 28 Feb 2013 23:25:03 +0000 (00:25 +0100)]
ffmpeg: fix variable name in psnr printing code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Feb 2013 23:11:53 +0000 (00:11 +0100)]
libvpxenc: dont redundantly zero fields, the whole context is zeroed on init
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Pascal Massimino [Thu, 28 Feb 2013 22:14:46 +0000 (14:14 -0800)]
libvpxenc: add psnr support
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diego Biurrun [Tue, 26 Feb 2013 15:33:22 +0000 (16:33 +0100)]
Revert "Move H264/QPEL specific asm from dsputil.asm to h264_qpel_*.asm."
This reverts commit
f90ff772e7e35b4923c2de429d1fab9f2569b568.
The code should be put back in h264_qpel_8bit.asm, but unfortunately
it is unconditionally used from dsputil_mmx.c since
71155d7.
Michael Niedermayer [Thu, 28 Feb 2013 19:24:05 +0000 (20:24 +0100)]
avformat/lavfi: force probesize to cover at least 30 frames
This ensures that fps and other values are estimated correctly,
the probesize also is intended to limit disk/protocol reads which
does not apply to lavfi inputs at all.
Fixes Ticket1051
Something similar could be usefull to other input devices
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Paul B Mahol [Wed, 27 Feb 2013 19:29:39 +0000 (19:29 +0000)]
exr: pxr24 decompression
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 28 Feb 2013 17:37:40 +0000 (17:37 +0000)]
exr: fix error message when pixel type is not set
This only happens with missing chlist attribute from header.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 28 Feb 2013 17:27:22 +0000 (17:27 +0000)]
exr: s/bits_per_color_id/pixel_type
Previous naming was misleading.
Also fix wrong message about missing
support for 32-bit unsigned int pixel type.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Paul B Mahol [Thu, 28 Feb 2013 16:50:33 +0000 (16:50 +0000)]
exr: track channels properties
Needed for proper decoding of channels with subsampling
and also for remaining compression methods.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Nicolas George [Wed, 27 Feb 2013 18:19:15 +0000 (19:19 +0100)]
lavf/avio: check for : in filenames for protocols.
If the first "special" character in a filename is a comma,
it can introduce protocol options, but only if there is a
colon at the end. Otherwise, it is just a filename with a
comma.
Fix trac ticket #2303.
Nicolas George [Tue, 26 Feb 2013 19:13:57 +0000 (20:13 +0100)]
lavfi/af_aresample: fix info log for unknown layouts.
Nicolas George [Tue, 26 Feb 2013 19:11:47 +0000 (20:11 +0100)]
lavfi/af_aresample: fix layout consistency check.
If the channel layout is unknown, lswr will internally use
the default one for the corresponding number of channels.
Nicolas George [Wed, 27 Feb 2013 16:47:15 +0000 (17:47 +0100)]
lavf: rescale duration for chained muxers.
Fix trac ticket #2300 because the duration of the segments
was computed using the timestamp of the last packet plus its
duration using the 1/90000 default time base instead of using
the chained muxer time base.
Nicolas George [Wed, 27 Feb 2013 16:53:35 +0000 (17:53 +0100)]
lavc/exr: use size_t instead of int for sizes.
Fix a segfault on 64-bits archs.
Michael Niedermayer [Thu, 28 Feb 2013 17:10:30 +0000 (18:10 +0100)]
loco: silence warning: decoded may be used uninitialized in this function
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Luca Barbato [Mon, 25 Feb 2013 09:37:39 +0000 (10:37 +0100)]
lls: mark max_order as unsigned short
The value is within 0 and 32.
Remove an `array subscript is below array bounds` warning.
Luca Barbato [Mon, 25 Feb 2013 07:06:59 +0000 (08:06 +0100)]
lls: move to the private namespace
The functions are private.
Luca Barbato [Mon, 25 Feb 2013 06:59:51 +0000 (07:59 +0100)]
lls: K&R formatting cosmetics
Martin Storsjö [Wed, 27 Feb 2013 21:22:39 +0000 (23:22 +0200)]
avconv: Apply codec options to streams that are copied as well
This allows setting/overriding e.g. the bitrate parameter, which
is required for the smoothstreaming muxer. Normally, the bitrate
is set by the demuxer in these cases, but not all demuxers can
provide it. This allows stream copy of data to the smoothstreaming
muxer from such inputs.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Wed, 27 Feb 2013 21:21:06 +0000 (23:21 +0200)]
cmdutils: Allow calling filter_codec_opts without a set encoder
In this case, no encoder specific options are filtered, only
options specific to that codec type in general.
Signed-off-by: Martin Storsjö <martin@martin.st>
Martin Storsjö [Thu, 28 Feb 2013 16:05:50 +0000 (18:05 +0200)]
pnm: Use av_pix_fmt_desc_get instead of accessing the array directly
This fixes boken fate tests with MSVC with DLLs, broken since
b5f536d24.
Signed-off-by: Martin Storsjö <martin@martin.st>
Michael Niedermayer [Thu, 28 Feb 2013 12:12:04 +0000 (13:12 +0100)]
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavf: Add a fate test for the noproxy pattern matching
lavf: Handle the environment variable no_proxy more properly
Conflicts:
libavformat/Makefile
libavformat/internal.h
libavformat/tls.c
libavformat/utils.c
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 28 Feb 2013 11:49:03 +0000 (12:49 +0100)]
Merge commit '
e2c272eb3660d7f4f1d7720980e30f6a617e7eb3'
* commit '
e2c272eb3660d7f4f1d7720980e30f6a617e7eb3':
LICENSE: Move (L)GPLv3 explanation block to a more suitable place
swscale: Add support for unscaled 8-bit Packed RGB -> Planar RGB
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 28 Feb 2013 07:57:10 +0000 (08:57 +0100)]
Improve dump_attachment documentation.
Fixes ticket #2299
Michael Niedermayer [Thu, 28 Feb 2013 00:42:55 +0000 (01:42 +0100)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: do not cycle through unavailable show modes
ffplay: add option to disable subtitling
ffplay: use NAN to signal invalid external clock
ffplay: if audio or video clock is invalid return NAN
ffplay: allow frame dropping if we redisplay an already displayed frame
ffplay: return true for pictq_prev_picture if it was successful
ffplay: only quit from audio_decode_frame before decoding when paused
ffplay: drop remaining frames in current audio avpacket when seeking
ffplay: signal seek event to read thread
Merged-by: Michael Niedermayer <michaelni@gmx.at>