ffmpeg.git
6 years agoMerge commit '5b097399baa2e38cc513939cfab3a9b6fdbc33df'
Michael Niedermayer [Sun, 28 Jul 2013 11:36:46 +0000 (13:36 +0200)]
Merge commit '5b097399baa2e38cc513939cfab3a9b6fdbc33df'

* commit '5b097399baa2e38cc513939cfab3a9b6fdbc33df':
  eval: Explicitly ignore return value of strtod() in parse_db()

Conflicts:
libavutil/eval.c

See: 3cd9849d9c24b0808e6e55cd7568250acaae2b91
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6ff15cd569e1345bc3612fb69ad3003b104fe50d'
Michael Niedermayer [Sun, 28 Jul 2013 11:23:33 +0000 (13:23 +0200)]
Merge commit '6ff15cd569e1345bc3612fb69ad3003b104fe50d'

* commit '6ff15cd569e1345bc3612fb69ad3003b104fe50d':
  Remove unreachable returns

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c8f0b20b4a6bb6691928789d83e4b02896969848'
Michael Niedermayer [Sun, 28 Jul 2013 11:13:47 +0000 (13:13 +0200)]
Merge commit 'c8f0b20b4a6bb6691928789d83e4b02896969848'

* commit 'c8f0b20b4a6bb6691928789d83e4b02896969848':
  avidec: Let the inner dv demuxer take care of discarding

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '10aa44aa675e05067845e3e55fac37642cbbdae4'
Michael Niedermayer [Sun, 28 Jul 2013 11:05:35 +0000 (13:05 +0200)]
Merge commit '10aa44aa675e05067845e3e55fac37642cbbdae4'

* commit '10aa44aa675e05067845e3e55fac37642cbbdae4':
  avidec: K&R formatting cosmetics

Conflicts:
libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '37063714c0a064808f9671ec4d376955d664f463'
Michael Niedermayer [Sun, 28 Jul 2013 09:54:23 +0000 (11:54 +0200)]
Merge commit '37063714c0a064808f9671ec4d376955d664f463'

* commit '37063714c0a064808f9671ec4d376955d664f463':
  build: Only check FATE dependencies when running FATE tests

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '16c22122c788b5e54a2f2e224bd0106429f0714c'
Michael Niedermayer [Sun, 28 Jul 2013 09:40:49 +0000 (11:40 +0200)]
Merge commit '16c22122c788b5e54a2f2e224bd0106429f0714c'

* commit '16c22122c788b5e54a2f2e224bd0106429f0714c':
  h264: K&R formatting cosmetics

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '966689442ed843019dc0722a49bfb0ac51755d19'
Michael Niedermayer [Sun, 28 Jul 2013 09:26:57 +0000 (11:26 +0200)]
Merge commit '966689442ed843019dc0722a49bfb0ac51755d19'

* commit '966689442ed843019dc0722a49bfb0ac51755d19':
  buffersink: K&R formatting cosmetics

Conflicts:
libavfilter/buffersink.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavc: do not override format if neither text nor bitmap codec prop is set
Marton Balint [Sat, 27 Jul 2013 19:14:44 +0000 (21:14 +0200)]
lavc: do not override format if neither text nor bitmap codec prop is set

Some decoders may output both, this way the decoder can set it.

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodpx: use av_image_copy_plane()
Paul B Mahol [Sat, 27 Jul 2013 20:51:14 +0000 (20:51 +0000)]
dpx: use av_image_copy_plane()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agodpxenc: cosmetics: reindent
Paul B Mahol [Sat, 27 Jul 2013 20:45:48 +0000 (20:45 +0000)]
dpxenc: cosmetics: reindent

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agotarga_y216dec: remove empty function
Paul B Mahol [Sat, 27 Jul 2013 20:27:15 +0000 (20:27 +0000)]
targa_y216dec: remove empty function

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agozmbv: return meaningful error code
Paul B Mahol [Sat, 27 Jul 2013 20:21:33 +0000 (20:21 +0000)]
zmbv: return meaningful error code

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoutvideoenc: use av_image_copy_plane()
Paul B Mahol [Sat, 27 Jul 2013 13:51:36 +0000 (13:51 +0000)]
utvideoenc: use av_image_copy_plane()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoForward interlaced field information from mov to v210 decoder.
Tim.Nicholson [Sat, 27 Jul 2013 16:57:28 +0000 (18:57 +0200)]
Forward interlaced field information from mov to v210 decoder.

Reported and tested by Dave Rice.

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
6 years agodoc/codecs: fix dangling reference to codec-options chapter
Stefano Sabatini [Sat, 27 Jul 2013 14:50:19 +0000 (16:50 +0200)]
doc/codecs: fix dangling reference to codec-options chapter

6 years agoeval: Explicitly ignore return value of strtod() in parse_db()
Diego Biurrun [Sat, 27 Jul 2013 11:14:15 +0000 (13:14 +0200)]
eval: Explicitly ignore return value of strtod() in parse_db()

The return value is not needed.  This fixes the warning:
libavutil/eval.c:353:15: warning: ignoring return value of ‘strtod’

6 years agoRemove unreachable returns
Diego Biurrun [Thu, 14 Feb 2013 11:42:57 +0000 (12:42 +0100)]
Remove unreachable returns

6 years agoavidec: Let the inner dv demuxer take care of discarding
Luca Barbato [Sat, 27 Jul 2013 13:48:41 +0000 (15:48 +0200)]
avidec: Let the inner dv demuxer take care of discarding

CC: libav-stable@libav.org
6 years agoavidec: K&R formatting cosmetics
Luca Barbato [Sat, 27 Jul 2013 10:47:09 +0000 (12:47 +0200)]
avidec: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agobuild: Only check FATE dependencies when running FATE tests
Diego Biurrun [Thu, 18 Jul 2013 16:12:27 +0000 (18:12 +0200)]
build: Only check FATE dependencies when running FATE tests

Only check dependencies if invoking the make targets 'check'
or anything matching 'fate%' except 'fate-rsync'.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavcodec/vorbisenc: change 6 asserts to av_asserts()
Michael Niedermayer [Sat, 27 Jul 2013 13:05:06 +0000 (15:05 +0200)]
avcodec/vorbisenc: change 6 asserts to av_asserts()

speed relevant ones use av_assert2()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpegvideo: update disabled assert() to av_assert0()
Michael Niedermayer [Sat, 27 Jul 2013 12:25:25 +0000 (14:25 +0200)]
avcodec/mpegvideo: update disabled assert() to av_assert0()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoexr: set pict_type
Paul B Mahol [Sat, 27 Jul 2013 11:30:55 +0000 (11:30 +0000)]
exr: set pict_type

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agotarga: set pict_type
Paul B Mahol [Sat, 27 Jul 2013 11:25:54 +0000 (11:25 +0000)]
targa: set pict_type

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoescape130: make "chroma_vals" static
Paul B Mahol [Fri, 26 Jul 2013 22:17:41 +0000 (22:17 +0000)]
escape130: make "chroma_vals" static

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolclenc: allocate FF_INPUT_BUFFER_PADDING_SIZE for extradata
Paul B Mahol [Fri, 26 Jul 2013 21:50:28 +0000 (21:50 +0000)]
lclenc: allocate FF_INPUT_BUFFER_PADDING_SIZE for extradata

Also check return value.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolclenc: cosmetics: reindent
Paul B Mahol [Fri, 26 Jul 2013 21:42:08 +0000 (21:42 +0000)]
lclenc: cosmetics: reindent

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agosgidec: safer check for buffer overflow
Paul B Mahol [Fri, 26 Jul 2013 21:53:54 +0000 (21:53 +0000)]
sgidec: safer check for buffer overflow

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agosgidec: return meaningful error codes
Paul B Mahol [Fri, 26 Jul 2013 21:26:56 +0000 (21:26 +0000)]
sgidec: return meaningful error codes

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agosgidec: simplify return path
Paul B Mahol [Fri, 26 Jul 2013 21:09:06 +0000 (21:09 +0000)]
sgidec: simplify return path

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoh264: K&R formatting cosmetics
Diego Biurrun [Fri, 26 Jul 2013 19:03:55 +0000 (21:03 +0200)]
h264: K&R formatting cosmetics

6 years agobuffersink: K&R formatting cosmetics
Diego Biurrun [Fri, 26 Jul 2013 19:09:36 +0000 (21:09 +0200)]
buffersink: K&R formatting cosmetics

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 27 Jul 2013 07:43:29 +0000 (09:43 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  wtv: Drop some casts that now are unnecessary

Conflicts:
libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '86f042dcabde2a5386dbd95ab0451b274987d253'
Michael Niedermayer [Sat, 27 Jul 2013 07:19:58 +0000 (09:19 +0200)]
Merge commit '86f042dcabde2a5386dbd95ab0451b274987d253'

* commit '86f042dcabde2a5386dbd95ab0451b274987d253':
  wtv: Make WTV_SECTOR_BITS a 64 bit constant

Conflicts:
libavformat/wtv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '80ade7985cd95156e2156f50adc7b86d0e43a07a'
Michael Niedermayer [Sat, 27 Jul 2013 07:12:56 +0000 (09:12 +0200)]
Merge commit '80ade7985cd95156e2156f50adc7b86d0e43a07a'

* commit '80ade7985cd95156e2156f50adc7b86d0e43a07a':
  AIX: add support for shared builds

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'b512360184ade835fba621f5042d643fc9e2ee9d'
Michael Niedermayer [Sat, 27 Jul 2013 07:05:26 +0000 (09:05 +0200)]
Merge commit 'b512360184ade835fba621f5042d643fc9e2ee9d'

* commit 'b512360184ade835fba621f5042d643fc9e2ee9d':
  avio: Don't set the seekable flag if no seek function is provided

See: 650355089cc4b38a57c88203c81f4896a98a5a7e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1297f7b87f8a84930a23eca705765c7c353dfcd5'
Michael Niedermayer [Sat, 27 Jul 2013 06:58:20 +0000 (08:58 +0200)]
Merge commit '1297f7b87f8a84930a23eca705765c7c353dfcd5'

* commit '1297f7b87f8a84930a23eca705765c7c353dfcd5':
  rtpenc: Fix some odd comments

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '779e6c2b985f2ad461a1ae704160822f97709ba7'
Michael Niedermayer [Sat, 27 Jul 2013 06:52:30 +0000 (08:52 +0200)]
Merge commit '779e6c2b985f2ad461a1ae704160822f97709ba7'

* commit '779e6c2b985f2ad461a1ae704160822f97709ba7':
  lavfi: add attribute_align_arg to all public entry points

Conflicts:
libavfilter/buffersink.c

See: af2a196e669cf7f00735a1df5889db35f3be87eb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_scale: set in_color_matrix default to "auto"
Michael Niedermayer [Fri, 26 Jul 2013 23:16:07 +0000 (01:16 +0200)]
avfilter/vf_scale: set in_color_matrix default to "auto"

6 years agoswscale/fill_rgb2yuv_table: fix default detection
Michael Niedermayer [Fri, 26 Jul 2013 23:11:37 +0000 (01:11 +0200)]
swscale/fill_rgb2yuv_table: fix default detection

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_scale: use sws_getCoefficients()
Michael Niedermayer [Fri, 26 Jul 2013 21:03:58 +0000 (23:03 +0200)]
avfilter/vf_scale: use sws_getCoefficients()

Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibavcodec/mpegvideo: change some asserts to av_assert0()
Michael Niedermayer [Fri, 26 Jul 2013 19:46:47 +0000 (21:46 +0200)]
libavcodec/mpegvideo: change some asserts to av_assert0()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpegvideo: replace assert about interlaced EC by debug av_log()
Michael Niedermayer [Fri, 26 Jul 2013 18:44:53 +0000 (20:44 +0200)]
avcodec/mpegvideo: replace assert about interlaced EC by debug av_log()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agowtv: Drop some casts that now are unnecessary
Martin Storsjö [Fri, 26 Jul 2013 18:50:40 +0000 (21:50 +0300)]
wtv: Drop some casts that now are unnecessary

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agowtv: Make WTV_SECTOR_BITS a 64 bit constant
Martin Storsjö [Wed, 24 Jul 2013 09:21:49 +0000 (12:21 +0300)]
wtv: Make WTV_SECTOR_BITS a 64 bit constant

This makes sure that values that are left-shifted by this constant
end up casted to 64 bit before shifting, avoiding overflow if the
value ends up larger than 2 GB.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoAIX: add support for shared builds
Michael Kostylev [Thu, 25 Jul 2013 15:37:20 +0000 (11:37 -0400)]
AIX: add support for shared builds

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoavio: Don't set the seekable flag if no seek function is provided
Hendrik Schreiber [Tue, 23 Jul 2013 09:25:34 +0000 (11:25 +0200)]
avio: Don't set the seekable flag if no seek function is provided

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agortpenc: Fix some odd comments
Martin Storsjö [Fri, 26 Jul 2013 17:40:25 +0000 (20:40 +0300)]
rtpenc: Fix some odd comments

Some weird comments stem from the fact that the rtpdec and rtpenc
code was shared earlier.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoqcelpdec: change asserts to av_asserts
Paul B Mahol [Fri, 26 Jul 2013 18:32:27 +0000 (18:32 +0000)]
qcelpdec: change asserts to av_asserts

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agosgienc: remove unused SgiContext
Paul B Mahol [Fri, 26 Jul 2013 18:21:44 +0000 (18:21 +0000)]
sgienc: remove unused SgiContext

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/frei0r: use AV_OPT_TYPE_IMAGE_SIZE
Paul B Mahol [Fri, 26 Jul 2013 17:16:26 +0000 (17:16 +0000)]
lavfi/frei0r: use AV_OPT_TYPE_IMAGE_SIZE

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi: add attribute_align_arg to all public entry points
Hendrik Leppkes [Fri, 26 Jul 2013 08:20:47 +0000 (10:20 +0200)]
lavfi: add attribute_align_arg to all public entry points

Previously it was partly only added to central functions called
internally, however if GCC would inline these into the public fuction, the
alignment attribute would not take effect.

Instead, add it to all public entry points to avoid these problems.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolavfi/frei0r: use AV_OPT_TYPE_VIDEO_RATE
Paul B Mahol [Fri, 26 Jul 2013 15:24:55 +0000 (15:24 +0000)]
lavfi/frei0r: use AV_OPT_TYPE_VIDEO_RATE

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavdevice/fbdev: use AV_OPT_TYPE_VIDEO_RATE
Paul B Mahol [Fri, 26 Jul 2013 15:20:13 +0000 (15:20 +0000)]
avdevice/fbdev: use AV_OPT_TYPE_VIDEO_RATE

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavdevice/x11grab: use AV_OPT_TYPE_VIDEO_RATE
Paul B Mahol [Fri, 26 Jul 2013 15:11:17 +0000 (15:11 +0000)]
avdevice/x11grab: use AV_OPT_TYPE_VIDEO_RATE

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi/gradfun: remove nv21/nv12 as they are not supported
Paul B Mahol [Wed, 24 Jul 2013 17:09:14 +0000 (17:09 +0000)]
lavfi/gradfun: remove nv21/nv12 as they are not supported

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agopcxenc: get rid of unused PCXContext
Paul B Mahol [Fri, 26 Jul 2013 14:00:40 +0000 (14:00 +0000)]
pcxenc: get rid of unused PCXContext

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoyop: check return value of av_frame_alloc()
Paul B Mahol [Fri, 26 Jul 2013 13:51:26 +0000 (13:51 +0000)]
yop: check return value of av_frame_alloc()

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agovmnc: check return values of reallocation
Paul B Mahol [Fri, 26 Jul 2013 13:49:36 +0000 (13:49 +0000)]
vmnc: check return values of reallocation

Also avoid memory leaks.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agovmnc: make code independent of sizeof(AVFrame)
Paul B Mahol [Fri, 26 Jul 2013 13:39:40 +0000 (13:39 +0000)]
vmnc: make code independent of sizeof(AVFrame)

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agolavfi: add attribute_align_arg to all public entry points
Hendrik Leppkes [Fri, 26 Jul 2013 08:31:05 +0000 (10:31 +0200)]
lavfi: add attribute_align_arg to all public entry points

Previously it was partly only added to central functions called
internally, however if GCC would inline these into the public fuction, the
alignment attribute would not take effect.

Instead, add it to all public entry points to avoid these problems.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/buffersrc: remove unused item from BufferSourceContext
Paul B Mahol [Fri, 26 Jul 2013 11:43:43 +0000 (11:43 +0000)]
lavfi/buffersrc: remove unused item from BufferSourceContext

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavformat/dtsdec: Improve probe, reject things looking like analoge signals
Michael Niedermayer [Fri, 26 Jul 2013 02:09:30 +0000 (04:09 +0200)]
avformat/dtsdec: Improve probe, reject things looking like analoge signals

Fixes Ticket2810

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 26 Jul 2013 09:11:46 +0000 (11:11 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  miscellaneous typo fixes

Conflicts:
configure
libavformat/avisynth.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '93a51984a27f3ba84d4e6f13d0c704ee9891603e'
Michael Niedermayer [Fri, 26 Jul 2013 08:57:51 +0000 (10:57 +0200)]
Merge commit '93a51984a27f3ba84d4e6f13d0c704ee9891603e'

* commit '93a51984a27f3ba84d4e6f13d0c704ee9891603e':
  mpeg12: Ignore slice threading if hwaccel is active

Conflicts:
libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '582963a8156522582e55466be4a59974a8d909a5'
Michael Niedermayer [Fri, 26 Jul 2013 08:51:42 +0000 (10:51 +0200)]
Merge commit '582963a8156522582e55466be4a59974a8d909a5'

* commit '582963a8156522582e55466be4a59974a8d909a5':
  vdpau: Fix VC-1 interlaced mode

Conflicts:
libavcodec/vdpau_vc1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3'
Michael Niedermayer [Fri, 26 Jul 2013 08:43:12 +0000 (10:43 +0200)]
Merge commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3'

* commit '4a2ef39442bf7f0150db07a1fbfcf8286e4d44a3':
  cosmetics: Add '0' to float constants ending in '.'.

Conflicts:
libavcodec/ra288.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6c145ecf785dc3d26ba3fed3ea9892cc80244625'
Michael Niedermayer [Fri, 26 Jul 2013 08:30:47 +0000 (10:30 +0200)]
Merge commit '6c145ecf785dc3d26ba3fed3ea9892cc80244625'

* commit '6c145ecf785dc3d26ba3fed3ea9892cc80244625':
  twinvq: K&R formatting cosmetics

Conflicts:
libavcodec/twinvq.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Thu, 25 Jul 2013 20:50:46 +0000 (22:50 +0200)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Show max bitrate for mpeg2 video streams in avcodec_string().
  Allow native compilation on the iPhone.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu/opt: show default values for AV_OPT_TYPE_PIXEL_FMT and AV_OPT_TYPE_SAMPLE_FMT too
Paul B Mahol [Thu, 25 Jul 2013 13:59:24 +0000 (13:59 +0000)]
lavu/opt: show default values for AV_OPT_TYPE_PIXEL_FMT and AV_OPT_TYPE_SAMPLE_FMT too

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoavformat/gxfenc: Added support for writing correct auxiliary data for DV streams.
Reuben Martin [Thu, 13 Jun 2013 04:17:21 +0000 (23:17 -0500)]
avformat/gxfenc: Added support for writing correct auxiliary data for DV streams.

Different aux data is written for DVCAM and DVPRO formats.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomiscellaneous typo fixes
Diego Biurrun [Sat, 4 May 2013 19:18:13 +0000 (21:18 +0200)]
miscellaneous typo fixes

6 years agompeg12: Ignore slice threading if hwaccel is active
Rémi Denis-Courmont [Wed, 24 Jul 2013 16:50:43 +0000 (19:50 +0300)]
mpeg12: Ignore slice threading if hwaccel is active

Slice threading does not work with hardware acceleration, as decoding
is per-picture.  This fixes Bugzilla #542.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoShow max bitrate for mpeg2 video streams in avcodec_string().
Carl Eugen Hoyos [Thu, 25 Jul 2013 08:53:47 +0000 (10:53 +0200)]
Show max bitrate for mpeg2 video streams in avcodec_string().

See also 25b7aa9

6 years agoAllow native compilation on the iPhone.
Carl Eugen Hoyos [Thu, 25 Jul 2013 08:52:15 +0000 (10:52 +0200)]
Allow native compilation on the iPhone.

6 years agoavfilter/can_merge_formats: fix memleak
Michael Niedermayer [Thu, 25 Jul 2013 14:54:04 +0000 (16:54 +0200)]
avfilter/can_merge_formats: fix memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/avfiltergraph: fix check using the wrong variables
Michael Niedermayer [Thu, 25 Jul 2013 14:53:39 +0000 (16:53 +0200)]
avfilter/avfiltergraph: fix check using the wrong variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovdpau: Fix VC-1 interlaced mode
Rainer Hochecker [Wed, 24 Jul 2013 16:50:42 +0000 (19:50 +0300)]
vdpau: Fix VC-1 interlaced mode

VDPAU expects the bitstream value (0, 2 or 3).
libavcodec uses an enum (0, 1 or 2).

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agocosmetics: Add '0' to float constants ending in '.'.
Diego Biurrun [Tue, 23 Jul 2013 21:48:45 +0000 (23:48 +0200)]
cosmetics: Add '0' to float constants ending in '.'.

6 years agotwinvq: K&R formatting cosmetics
Diego Biurrun [Fri, 19 Jul 2013 22:06:29 +0000 (00:06 +0200)]
twinvq: K&R formatting cosmetics

6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 25 Jul 2013 08:15:03 +0000 (10:15 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  arm: Comment out unused labels in simple_idct_arm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_scale: use the inputs color range when its set and its not overridden
Michael Niedermayer [Wed, 24 Jul 2013 23:27:00 +0000 (01:27 +0200)]
avfilter/vf_scale: use the inputs color range when its set and its not overridden

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswscale/sws_getColorspaceDetails: dont fail for non yuv
Michael Niedermayer [Thu, 25 Jul 2013 00:42:09 +0000 (02:42 +0200)]
swscale/sws_getColorspaceDetails: dont fail for non yuv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mjpegdec: Support RGBA lpegs
Michael Niedermayer [Wed, 24 Jul 2013 22:32:44 +0000 (00:32 +0200)]
avcodec/mjpegdec: Support RGBA lpegs

Fixes Ticket896

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswscale: exchange src & dst chroma pos
Michael Niedermayer [Wed, 24 Jul 2013 20:43:50 +0000 (22:43 +0200)]
swscale: exchange src & dst chroma pos

Found-by: wm4
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoarm: Comment out unused labels in simple_idct_arm
Martin Storsjö [Wed, 24 Jul 2013 09:22:55 +0000 (12:22 +0300)]
arm: Comment out unused labels in simple_idct_arm

When building for iOS in thumb mode, gas-preprocessor.pl doesn't
mark unused labels as thumb functions (as it does for other
local labels, where it can figure out that they are functions
due to being referenced in branch instructions). This leads to
linker warnings for some of those local labels, such as:

ld: warning: ARM function not 4-byte aligned: __a_evaluation from
libavcodec/libavcodec.a(simple_idct_arm.o)

Therefore, comment them out since they don't have any function.
They do still have a value in documenting key points in the
assembly source though.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agovf_scale: add input h/v_chr_pos parameters
Michael Niedermayer [Wed, 24 Jul 2013 16:33:58 +0000 (18:33 +0200)]
vf_scale: add input h/v_chr_pos parameters

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovf_scale: add output h/v_chr_pos parameterss
Michael Niedermayer [Sun, 14 Jul 2013 03:03:06 +0000 (05:03 +0200)]
vf_scale: add output h/v_chr_pos parameterss

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/encoders: partially rewrite and reformat libx264 docs
Timothy Gu [Mon, 22 Jul 2013 23:44:11 +0000 (16:44 -0700)]
doc/encoders: partially rewrite and reformat libx264 docs

Format is based on the thread:
"[PATCH] doc/encoders: Add libopus encoder doc" (06-28-2013)
http://thread.gmane.org/gmane.comp.video.ffmpeg.devel/165368/

Also merge the two option sections (Mapping and Private options).

Patch partially edited by Stefano Sabatini.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agomatroskaenc: implement CueRelativePosition
Bernie Habermeier [Tue, 23 Jul 2013 07:52:08 +0000 (00:52 -0700)]
matroskaenc: implement CueRelativePosition

This is a minimal change to matroskaenc that implements CueRelativePosition in the output.
Most players will probably ignore this additional information, but it is in the
matroska spec, and it'd be nice to be able to make use of it.

Signed-off-by: Bernt Habermeier <bernt@wulfram.com>
Tested-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpeg12dec: remove commented out assert
Michael Niedermayer [Wed, 24 Jul 2013 11:00:04 +0000 (13:00 +0200)]
avcodec/mpeg12dec: remove commented out assert

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodocumented that av_codec_close is required to call
Anshul Maheshwari [Wed, 24 Jul 2013 06:50:02 +0000 (12:20 +0530)]
documented that av_codec_close is required to call

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoalsdec: minor simplification in read_block()
Michael Niedermayer [Wed, 24 Jul 2013 10:36:52 +0000 (12:36 +0200)]
alsdec: minor simplification in read_block()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Wed, 24 Jul 2013 10:01:29 +0000 (12:01 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  8bps: Make the bound-checks consistent

Conflicts:
libavcodec/8bps.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c'
Michael Niedermayer [Wed, 24 Jul 2013 09:41:39 +0000 (11:41 +0200)]
Merge commit 'bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c'

* commit 'bd7b4da0f4627bb6c4a7c2575da83fe6b261a21c':
  8bps: Bound-check the input buffer

Conflicts:
libavcodec/8bps.c

See: 66ff90f4a3d81c25feaa672dc8cc9cc88017753d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2f034f255c49050e894ab9b88087c09ebe249f3f'
Michael Niedermayer [Wed, 24 Jul 2013 09:09:26 +0000 (11:09 +0200)]
Merge commit '2f034f255c49050e894ab9b88087c09ebe249f3f'

* commit '2f034f255c49050e894ab9b88087c09ebe249f3f':
  4xm: Reject not a multiple of 16 dimension

The newly added checks are redundant and thus replaced by asserts

See: db5b4875514eb7740844f514dbf236c9179a6a93
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ca488ad480360dfafcb5766f7bfbb567a0638979'
Michael Niedermayer [Wed, 24 Jul 2013 08:28:38 +0000 (10:28 +0200)]
Merge commit 'ca488ad480360dfafcb5766f7bfbb567a0638979'

* commit 'ca488ad480360dfafcb5766f7bfbb567a0638979':
  alsdec: Clean up error paths

Conflicts:
libavcodec/alsdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '70ecc175c7b513a153ac87d1c5d219556ca55070'
Michael Niedermayer [Wed, 24 Jul 2013 08:15:50 +0000 (10:15 +0200)]
Merge commit '70ecc175c7b513a153ac87d1c5d219556ca55070'

* commit '70ecc175c7b513a153ac87d1c5d219556ca55070':
  alsdec: Fix the clipping range

Conflicts:
libavcodec/alsdec.c

See: feaff427c0df015146f660199453bd8c0314e677

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/http: support reading compressed data
Zhang Rui [Mon, 22 Jul 2013 20:07:10 +0000 (04:07 +0800)]
avformat/http: support reading compressed data

Derived from VLC's http module.
Original authors:
  Antoine Cellerier <dionoea@videolan.org>
  Sébastien Escudier <sebastien-devel@celeos.eu>
  Rémi Duraffort <ivoire@videolan.org>
  Rémi Denis-Courmont <remi@remlab.net>
  Francois Cartegnie <fcvlcdev@free.fr>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/utils: Warn the user about the lack of a lock manager if insufficient locks...
Michael Niedermayer [Tue, 23 Jul 2013 23:04:24 +0000 (01:04 +0200)]
avcodec/utils: Warn the user about the lack of a lock manager if insufficient locks are detected

A lock manager is not the only possibility to avoid open/close locking
issues but its easier and more robust than maintaining a lot of lock/unlock
calls.

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