ffmpeg.git
6 years agoRemove incorrect use of ctype.h functions.
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>
6 years agoDeprecate deinterlaced in libavcodec.
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>
6 years agoffmpeg: fix -stats -v 0
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>
6 years agoavformat: gather aspect ratio from rv30/40 in find_stream_info
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>
6 years agorv34: fix aspect ratio
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>
6 years agowmadec: check nb_frames
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>
6 years agoMerge remote-tracking branch 'cehoyos/master'
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>
6 years agoh264: put call to ff_print_debug_info2 under CONFIG_MPEGVIDEO.
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>
6 years agoh264: make it possible to compile without error_resilience.
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>
6 years agomovenc: Do not flag secondary audio and subtitle tracks as enabled.
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>
6 years agoMerge remote-tracking branch 'qatar/master'
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>
6 years agoh264: add a copy of draw_horiz_band.
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>
6 years agolibxvid: cleanup on error pathes
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>
6 years agolibxvid: check & clear encoder_handle
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>
6 years agolibxvid: use av_freep() for saftey
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>
6 years agolibxvid: remove temporary files at the end
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>
6 years agortpdec: Initialize some variables to silence compiler warnings
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>
6 years agomjpegdec: fix endiansoup
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>
6 years agoAvoid huge memory allocations from asf demuxer.
Carl Eugen Hoyos [Sat, 2 Mar 2013 17:37:55 +0000 (18:37 +0100)]
Avoid huge memory allocations from asf demuxer.

Fixes ticket #1888.

6 years agolavc/flacdec: Add frame CRC calculation
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>
6 years agoffmpeg: print maxrss "-benchmark" data even on errors
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>
6 years agoer: Fix slice threading check
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>
6 years agoMerge remote-tracking branch 'qatar/master'
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>
6 years agoMerge commit '668e16a0dd1ff56d4beeff5c658d8a2a08dbfac8'
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>
6 years agoMerge commit 'e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9'
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>
6 years agoMerge commit 'c91c63b5380bf79655c09320774a022f84d76fd5'
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>
6 years agoh264: set ref_count to 0 for intra slices.
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

6 years agoh264: on reference overflow, reset the reference count to 0, not 1.
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

6 years agoh264: do not copy ref count/ref2frm when updating per-frame context
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.

6 years agov4l2: fix regression that caused ffmpeg to occasionally get stuck
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>
6 years agolavd/v4l2: copy frames into normally allocated packets whenever there is just one...
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>
6 years agoflvdec: Check the return value of a malloc
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>
6 years agoflvdec: Don't read the VP6 header byte when setting codec type based on metadata
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>
6 years agoffplay: use AVFrame accessor functions
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>
6 years agoavcodec/utils: use AVFrame accessor functions
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>
6 years agoavcodec/rawdec: use AVFrame accessor functions
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>
6 years agopngdec: use AVFrame accessor functions
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>
6 years agogifdec: use AVFrame accessor functions
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>
6 years agocpia: use AVFrame accessor functions
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>
6 years agotiff: use AVFrame accessor functions
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>
6 years agoac3dec: use AVFrame accessor functions
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>
6 years agoffprobe: use AVFrame accessor functions
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>
6 years agodoc/examples/demuxing: use AVFrame accessor functions
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>
6 years agoavcodec: add ff_frame_get_metadatap()
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>
6 years agolavc/codec_desc: add/fix .props for SGI/DPX/X-face/BRender PIX image
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>
6 years agoHandle an invalid extra mpeg2 picture header following a frame-encoded picture.
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>
6 years agosgidec: use unchecked bytestream2 functions where it makes sense
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>
6 years agosoxr: libsoxr 0.1.1 support
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>
6 years agoexr: use bytestream functions in pxr24_uncompress()
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>
6 years agoMerge remote-tracking branch 'qatar/master'
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>
6 years agoMerge commit '4da950c0ae224b9b8ef952dadf614be2c050023e'
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>
6 years agoMerge commit 'e8c52271c45ec27d783e74238dcfad0c2008731c'
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>
6 years agoMerge commit '399663be9d4a839b894c48a21b62926eb8497d72'
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>
6 years agoMerge commit '9d4da474f5f40b019cb4cb931c8499deee586174'
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>
6 years agoMerge commit '7ac6d2423e9bf0f40c67be9a0ca7600b516b0282'
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>
6 years agoMerge commit 'df0229a7caa124dcfb84c34b48d316744c467311'
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>
6 years agoMerge commit 'cb6f8245aed2c26fe95c30cd68c45983277a945a'
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>
6 years agolls: Do not return from void functions
Diego Biurrun [Thu, 28 Feb 2013 20:32:02 +0000 (21:32 +0100)]
lls: Do not return from void functions

6 years agolls: #ifndef --> #if in FF_API_ version guard
Diego Biurrun [Thu, 28 Feb 2013 20:31:26 +0000 (21:31 +0100)]
lls: #ifndef --> #if in FF_API_ version guard

6 years agoffmpeg: fix variable name in psnr printing code
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>
6 years agolibvpxenc: dont redundantly zero fields, the whole context is zeroed on init
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>
6 years agolibvpxenc: add psnr support
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>
6 years agoRevert "Move H264/QPEL specific asm from dsputil.asm to h264_qpel_*.asm."
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.

6 years agoavformat/lavfi: force probesize to cover at least 30 frames
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>
6 years agoexr: pxr24 decompression
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>
6 years agoexr: fix error message when pixel type is not set
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>
6 years agoexr: s/bits_per_color_id/pixel_type
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>
6 years agoexr: track channels properties
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>
6 years agolavf/avio: check for : in filenames for protocols.
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.

6 years agolavfi/af_aresample: fix info log for unknown layouts.
Nicolas George [Tue, 26 Feb 2013 19:13:57 +0000 (20:13 +0100)]
lavfi/af_aresample: fix info log for unknown layouts.

6 years agolavfi/af_aresample: fix layout consistency check.
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.

6 years agolavf: rescale duration for chained muxers.
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.

6 years agolavc/exr: use size_t instead of int for sizes.
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.

6 years agoloco: silence warning: decoded may be used uninitialized in this function
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>
6 years agolls: mark max_order as unsigned short
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.

6 years agolls: move to the private namespace
Luca Barbato [Mon, 25 Feb 2013 07:06:59 +0000 (08:06 +0100)]
lls: move to the private namespace

The functions are private.

6 years agolls: K&R formatting cosmetics
Luca Barbato [Mon, 25 Feb 2013 06:59:51 +0000 (07:59 +0100)]
lls: K&R formatting cosmetics

6 years agoavconv: Apply codec options to streams that are copied as well
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>
6 years agocmdutils: Allow calling filter_codec_opts without a set encoder
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>
6 years agopnm: Use av_pix_fmt_desc_get instead of accessing the array directly
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>
6 years agoMerge remote-tracking branch 'qatar/master'
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>
6 years agoMerge commit 'e2c272eb3660d7f4f1d7720980e30f6a617e7eb3'
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>
6 years agoImprove dump_attachment documentation.
Carl Eugen Hoyos [Thu, 28 Feb 2013 07:57:10 +0000 (08:57 +0100)]
Improve dump_attachment documentation.

Fixes ticket #2299

6 years agoMerge remote-tracking branch 'cus/stable'
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>
6 years agoRevert "lavf/utils: add support for special characters encoding in URL"
Michael Niedermayer [Thu, 28 Feb 2013 00:25:16 +0000 (01:25 +0100)]
Revert "lavf/utils: add support for special characters encoding in URL"

This reverts commit 4a8fc1d83b1b55e1ac533644168018ebeec0c732.

The commit caused null pointer derefernces when using udp://
after i fixed that it caused ffmpeg to get stuck and remapped
arguments like ?ttl=255 -> ?ttl%3d255

I dont want to leave this broken thus temporary revert so we all
have some time to look at this without half the network protocols
being broken in the meantime

6 years agobuild: make iconv build configurable.
Clément Bœsch [Wed, 27 Feb 2013 23:45:51 +0000 (00:45 +0100)]
build: make iconv build configurable.

6 years agolavf/utils: add support for special characters encoding in URL
Senthilnathan M [Sun, 10 Feb 2013 17:38:52 +0000 (23:08 +0530)]
lavf/utils: add support for special characters encoding in URL

In particular, fix trac ticket #2031.

Signed-off-by: Senthilnathan M <senthilnathan.maadasamy@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agolavf/concatdec: define "ffcat" and "ffconcat" extensions
Stefano Sabatini [Thu, 21 Feb 2013 18:33:07 +0000 (19:33 +0100)]
lavf/concatdec: define "ffcat" and "ffconcat" extensions

6 years agoffplay: do not cycle through unavailable show modes
Marton Balint [Sat, 23 Feb 2013 01:15:06 +0000 (02:15 +0100)]
ffplay: do not cycle through unavailable show modes

Fixes ticket #2200.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: add option to disable subtitling
Marton Balint [Sat, 23 Feb 2013 00:52:23 +0000 (01:52 +0100)]
ffplay: add option to disable subtitling

Fixes ticket #2201.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: use NAN to signal invalid external clock
Marton Balint [Fri, 22 Feb 2013 17:18:00 +0000 (18:18 +0100)]
ffplay: use NAN to signal invalid external clock

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: if audio or video clock is invalid return NAN
Marton Balint [Sat, 16 Feb 2013 22:36:07 +0000 (23:36 +0100)]
ffplay: if audio or video clock is invalid return NAN

This helps us not to make bad decision (frame dropping, audio compensation)
right after seeking when we do not know yet the recent audio or video clock.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: allow frame dropping if we redisplay an already displayed frame
Marton Balint [Sat, 16 Feb 2013 13:24:34 +0000 (14:24 +0100)]
ffplay: allow frame dropping if we redisplay an already displayed frame

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: return true for pictq_prev_picture if it was successful
Marton Balint [Sat, 9 Feb 2013 23:29:29 +0000 (00:29 +0100)]
ffplay: return true for pictq_prev_picture if it was successful

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: only quit from audio_decode_frame before decoding when paused
Marton Balint [Sat, 16 Feb 2013 19:56:19 +0000 (20:56 +0100)]
ffplay: only quit from audio_decode_frame before decoding when paused

This way the audio clock is updated to a proper value even when the video is
paused.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: drop remaining frames in current audio avpacket when seeking
Marton Balint [Sat, 16 Feb 2013 19:53:07 +0000 (20:53 +0100)]
ffplay: drop remaining frames in current audio avpacket when seeking

Fixes ticket #1928.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agoffplay: signal seek event to read thread
Marton Balint [Sat, 16 Feb 2013 19:21:13 +0000 (20:21 +0100)]
ffplay: signal seek event to read thread

Improves seek delay.

Signed-off-by: Marton Balint <cus@passwd.hu>
6 years agobuild: fix iconv detection on some systems.
Clément Bœsch [Wed, 27 Feb 2013 19:58:48 +0000 (20:58 +0100)]
build: fix iconv detection on some systems.

This at least fix the build on CentOS.

6 years agolavf: Add a fate test for the noproxy pattern matching
Martin Storsjö [Wed, 27 Feb 2013 09:45:16 +0000 (11:45 +0200)]
lavf: Add a fate test for the noproxy pattern matching

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolavf: Handle the environment variable no_proxy more properly
Martin Storsjö [Wed, 27 Feb 2013 09:13:47 +0000 (11:13 +0200)]
lavf: Handle the environment variable no_proxy more properly

The handling of the environment variable no_proxy, present since
one of the initial commits (de6d9b6404), is inconsistent with
how many other applications and libraries interpret this
variable. Its bare presence does not indicate that the use of
proxies should be skipped, but it is some sort of pattern for
hosts that does not need using a proxy (e.g. for a local network).

As investigated by Rudolf Polzer, different libraries handle this
in different ways, some supporting IP address masks, some supporting
arbitrary globbing using *, some just checking that the pattern matches
the end of the hostname without regard for whether it actually is
the right domain or a domain that ends in the same string.

This simple logic should be pretty similar to the logic used by
lynx and curl.

Signed-off-by: Martin Storsjö <martin@martin.st>