ffmpeg.git
4 years agoavformat/cdg: Do not fail if filesize cannot be determined
Michael Niedermayer [Thu, 10 Jul 2014 23:04:04 +0000 (01:04 +0200)]
avformat/cdg: Do not fail if filesize cannot be determined

This fixes cdg with piped input which was broken by the previous commit

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '44386aaad870cbd80ae0d08247ebc663476446ff'
Michael Niedermayer [Thu, 10 Jul 2014 22:49:52 +0000 (00:49 +0200)]
Merge commit '44386aaad870cbd80ae0d08247ebc663476446ff'

* commit '44386aaad870cbd80ae0d08247ebc663476446ff':
  cdg: Forward error from avio_size() in read_header() function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agocdg: Forward error from avio_size() in read_header() function
Nidhi Makhijani [Thu, 10 Jul 2014 08:14:51 +0000 (13:44 +0530)]
cdg: Forward error from avio_size() in read_header() function

Signed-off-by: Diego Biurrun <diego@biurrun.de>
4 years agox86/yadif-10: remove duplicate ABS macro
James Almer [Tue, 8 Jul 2014 16:50:05 +0000 (13:50 -0300)]
x86/yadif-10: remove duplicate ABS macro

And use the x86util ones instead, which are optimized for mmxext/sse2.
About ~1% increase in performance on pre SSSE3 processors.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohevc: derive partial merge list
Christophe Gisquet [Thu, 10 Jul 2014 06:47:52 +0000 (06:47 +0000)]
hevc: derive partial merge list

The merge list only needs to be derived up to the merge index.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohevc: derive partially amvp list
Christophe Gisquet [Thu, 10 Jul 2014 06:47:53 +0000 (06:47 +0000)]
hevc: derive partially amvp list

When the candidate has been found, no need to derive others.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoFix 2 coeffecient typo
Clément Bœsch [Thu, 10 Jul 2014 13:29:54 +0000 (15:29 +0200)]
Fix 2 coeffecient typo

4 years agohevc: reorder loops
Christophe Gisquet [Thu, 10 Jul 2014 06:47:56 +0000 (06:47 +0000)]
hevc: reorder loops

iterate over memory in a more continuous order

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohevc: simplify rounding
Christophe Gisquet [Thu, 10 Jul 2014 06:47:55 +0000 (06:47 +0000)]
hevc: simplify rounding

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agobuild: rawvideo decoder depends on bswapdsp
Yu Xiaolei [Thu, 10 Jul 2014 10:40:05 +0000 (18:40 +0800)]
build: rawvideo decoder depends on bswapdsp

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '5adcef9c1bf701ba2dd43363ae983ba6d74bdb9a'
Michael Niedermayer [Thu, 10 Jul 2014 11:14:27 +0000 (13:14 +0200)]
Merge commit '5adcef9c1bf701ba2dd43363ae983ba6d74bdb9a'

* commit '5adcef9c1bf701ba2dd43363ae983ba6d74bdb9a':
  mpegts: pass MpegTSContext ptr explicitly

See: 8635954335061ea4c03d3f492b7bc803ea740d9c:
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc/filters: add a signalstats example
Dave Rice [Wed, 9 Jul 2014 03:41:47 +0000 (23:41 -0400)]
doc/filters: add a signalstats example

Signed-off-by: Dave Rice <dave@dericed.com>
4 years agompegts: pass MpegTSContext ptr explicitly
Alexander V. Lukyanov [Tue, 8 Jul 2014 07:54:15 +0000 (11:54 +0400)]
mpegts: pass MpegTSContext ptr explicitly

AVFormatContext->priv_data is not always a MpegTSContext, it can be
RTSPState when decoding a RTP stream. So it is necessary to pass
MpegTSContext pointer explicitly.

Within libav, the write_section_data function doesn't actually use
the MpegTSContext at all, so this doesn't change anything at the
moment (no memory was corrupted before), but it reduces the risk of
anybody trying to touch the MpegTSContext via AVFormatContext->priv_data
in the future.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoFix compilation with --disable-everything.
Carl Eugen Hoyos [Thu, 10 Jul 2014 06:26:59 +0000 (08:26 +0200)]
Fix compilation with --disable-everything.

4 years agoalpha/pixblockdsp: move code out of dsputil
James Almer [Thu, 10 Jul 2014 01:16:29 +0000 (22:16 -0300)]
alpha/pixblockdsp: move code out of dsputil

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: fix select vs. deps
Michael Niedermayer [Thu, 10 Jul 2014 00:32:25 +0000 (02:32 +0200)]
configure: fix select vs. deps

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agogitignore: add examples/transcoding
Lukasz Marek [Wed, 9 Jul 2014 23:25:40 +0000 (01:25 +0200)]
gitignore: add examples/transcoding

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoconfigure: add new dependencies for spp & mpdecimate
Michael Niedermayer [Wed, 9 Jul 2014 23:34:16 +0000 (01:34 +0200)]
configure: add new dependencies for spp & mpdecimate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e'
Michael Niedermayer [Wed, 9 Jul 2014 22:56:05 +0000 (00:56 +0200)]
Merge commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e'

* commit 'f46bb608d9d76c543e4929dc8cffe36b84bd789e':
  dsputil: Split off pixel block routines into their own context

Conflicts:
configure
libavcodec/dsputil.c
libavcodec/mpegvideo_enc.c
libavcodec/pixblockdsp_template.c
libavcodec/x86/dsputilenc.asm
libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/hlsenc: correctly compute target duration
Nicolas Martyanoff [Mon, 7 Jul 2014 11:26:12 +0000 (13:26 +0200)]
avformat/hlsenc: correctly compute target duration

With HLS, the duration of all segments must be lower or equal to the target
duration. Therefore floor(duration + 0.5) yields incorrect results.

For example, for duration = 1.35, floor(duration + 0.5) yields 1.0, but the
correct result is 2.0.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
4 years agoavcodec/hevc_sei: factor return 1 out of if/else chain
Michael Niedermayer [Wed, 9 Jul 2014 22:16:29 +0000 (00:16 +0200)]
avcodec/hevc_sei: factor return 1 out of if/else chain

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50'
Michael Niedermayer [Wed, 9 Jul 2014 22:15:34 +0000 (00:15 +0200)]
Merge commit '0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50'

* commit '0569a7e0bd2006d9a5248d17a1f4bf3ca654ae50':
  hevc: parse display orientation SEI message

Conflicts:
libavcodec/hevc.h
libavcodec/hevc_sei.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09'
Michael Niedermayer [Wed, 9 Jul 2014 22:07:04 +0000 (00:07 +0200)]
Merge commit '18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09'

* commit '18e3d61e9e3b52c177aa7a1f2a054a8a753e1b09':
  h264: parse display orientation SEI message

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a54f03bf07da964a1b04b03b85bc39deba76efa4'
Michael Niedermayer [Wed, 9 Jul 2014 21:57:20 +0000 (23:57 +0200)]
Merge commit 'a54f03bf07da964a1b04b03b85bc39deba76efa4'

* commit 'a54f03bf07da964a1b04b03b85bc39deba76efa4':
  display: add matrix flip api

Conflicts:
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '33a7b453a8e1f090c694ea4f36769dc837be88f0'
Michael Niedermayer [Wed, 9 Jul 2014 21:45:58 +0000 (23:45 +0200)]
Merge commit '33a7b453a8e1f090c694ea4f36769dc837be88f0'

* commit '33a7b453a8e1f090c694ea4f36769dc837be88f0':
  doc: mention option to mix shared/static libraries

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '0307cc2253e76772b1c645ac6117d08da87a147c'
Michael Niedermayer [Wed, 9 Jul 2014 21:40:09 +0000 (23:40 +0200)]
Merge commit '0307cc2253e76772b1c645ac6117d08da87a147c'

* commit '0307cc2253e76772b1c645ac6117d08da87a147c':
  rtpdec: pass an AVFormatContext to ff_parse_fmtp()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '650d384048ed42579cc6d67bf32a94b468c0b6cb'
Michael Niedermayer [Wed, 9 Jul 2014 21:34:33 +0000 (23:34 +0200)]
Merge commit '650d384048ed42579cc6d67bf32a94b468c0b6cb'

* commit '650d384048ed42579cc6d67bf32a94b468c0b6cb':
  yuv4mpegenc: do not access AVCodecContext.coded_frame

Conflicts:
libavformat/yuv4mpegenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '27c1f82f561932c83191bcd3e70e0cb1712485ba'
Michael Niedermayer [Wed, 9 Jul 2014 21:26:09 +0000 (23:26 +0200)]
Merge commit '27c1f82f561932c83191bcd3e70e0cb1712485ba'

* commit '27c1f82f561932c83191bcd3e70e0cb1712485ba':
  nsvdec: remove commented out cruft

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'edb1af7c466ebb28bfdb0c076e498e527b43d24f'
Michael Niedermayer [Wed, 9 Jul 2014 21:18:50 +0000 (23:18 +0200)]
Merge commit 'edb1af7c466ebb28bfdb0c076e498e527b43d24f'

* commit 'edb1af7c466ebb28bfdb0c076e498e527b43d24f':
  mov: free the dv demux context with avformat_free_context()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb'
Michael Niedermayer [Wed, 9 Jul 2014 21:11:01 +0000 (23:11 +0200)]
Merge commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb'

* commit 'a14b61658c3302081ea5da3ea65b7d9f7b4fb2eb':
  mtv: do not set sample_rate for video

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'b8604a976128ffbd316653cdec11ba487f1025bb'
Michael Niedermayer [Wed, 9 Jul 2014 20:48:25 +0000 (22:48 +0200)]
Merge commit 'b8604a976128ffbd316653cdec11ba487f1025bb'

* commit 'b8604a976128ffbd316653cdec11ba487f1025bb':
  oggparsecelt: do not set AVCodecContext.frame_size

Conflicts:
libavformat/oggparsecelt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6'
Michael Niedermayer [Wed, 9 Jul 2014 20:37:42 +0000 (22:37 +0200)]
Merge commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6'

* commit 'd5cf5afabbf43f00283e70b12afbe1da030d85b6':
  adxdec: get rid of an avpriv function

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1'
Michael Niedermayer [Wed, 9 Jul 2014 20:21:46 +0000 (22:21 +0200)]
Merge commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1'

* commit 'f6ee61fb05482c617f5deee29a190d8ff483b3d1':
  lavc: export DV profile API used by muxer/demuxer as public

Conflicts:
configure
doc/APIchanges
libavcodec/Makefile
libavcodec/dv_profile.c
libavcodec/dv_profile.h
libavcodec/version.h
libavformat/dvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffmpeg: remove common factors from copied timebase
Michael Niedermayer [Wed, 9 Jul 2014 19:48:16 +0000 (21:48 +0200)]
ffmpeg: remove common factors from copied timebase

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3f3232a371cc88696184d9aef1f812656264e56c'
Michael Niedermayer [Wed, 9 Jul 2014 19:44:25 +0000 (21:44 +0200)]
Merge commit '3f3232a371cc88696184d9aef1f812656264e56c'

* commit '3f3232a371cc88696184d9aef1f812656264e56c':
  avconv: set the output stream timebase

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'c9c1265c52910578d3db1a6205c85b91ead0903f'
Michael Niedermayer [Wed, 9 Jul 2014 19:37:05 +0000 (21:37 +0200)]
Merge commit 'c9c1265c52910578d3db1a6205c85b91ead0903f'

* commit 'c9c1265c52910578d3db1a6205c85b91ead0903f':
  avformat: update muxing doxy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'abda15a990527557c20848f6ca2f82eb85e76dc9'
Michael Niedermayer [Wed, 9 Jul 2014 19:29:21 +0000 (21:29 +0200)]
Merge commit 'abda15a990527557c20848f6ca2f82eb85e76dc9'

* commit 'abda15a990527557c20848f6ca2f82eb85e76dc9':
  cdg: set the keyframe flag on the first packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/roqvideoenc: Print the correct max resolution
Michael Niedermayer [Wed, 9 Jul 2014 19:14:24 +0000 (21:14 +0200)]
avcodec/roqvideoenc: Print the correct max resolution

Thanks-to: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/roqvideoenc: More verbose warning about no power of 2 dimensions
Michael Niedermayer [Wed, 9 Jul 2014 19:10:13 +0000 (21:10 +0200)]
avcodec/roqvideoenc: More verbose warning about no power of 2 dimensions

Thanks-to: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/dvdsubenc: Add dvdsub workaround for some players
Oliver Fromme [Wed, 9 Jul 2014 16:43:58 +0000 (18:43 +0200)]
avcodec/dvdsubenc: Add dvdsub workaround for some players

The issue affects dvdsub subtitles (a.k.a. VOBSUB).

Some players -- in particular hardware players -- cut off
the lowest row of pixels if the number of rows in the subtitle
is odd.

The patch below implements a work-around for that.  If the
number of rows is odd, it is simply rounded up to an even
number, adding an invisible (i.e. fully transparent) row.
The work-around can be enabled or disabled with a new
option -even_rows_fix.  The default is disabled, so there
is no change of behaviour for users who don't care about it.

The overhead for the fix is low, and in many cases even zero:
For subtitles with an odd number of rows (i.e. in 50% of
cases on average), the size increases by two bytes because
a fully transparent row is encoded as 0x00 0x00.  However,
in the VOBSUB standard, all data packets are padded to 2KB
anyway, so in most cases the additional bytes just use some
part of the padding, so there is no overhead.  Only in the
rare case that the 2KB boundary is hit (0.1% chance), a full
2KB block is added.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/pthread_frame: fix setting hwaccel with threads and get_format()
Michael Niedermayer [Wed, 9 Jul 2014 17:51:49 +0000 (19:51 +0200)]
avcodec/pthread_frame: fix setting hwaccel with threads and get_format()

Fixes assertion failure with vdpau and vlc
Fixes Ticket3742

Tested-by: oromit
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/bprint:ædd io.h, try to fix msvc build
Michael Niedermayer [Wed, 9 Jul 2014 15:58:20 +0000 (17:58 +0200)]
avutil/bprint:ædd io.h, try to fix msvc build

Suggested-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodsputil: Split off pixel block routines into their own context
Diego Biurrun [Mon, 3 Feb 2014 22:29:09 +0000 (14:29 -0800)]
dsputil: Split off pixel block routines into their own context

4 years agoavformat/m4vdec: raise threshold slightly for detection
Michael Niedermayer [Wed, 9 Jul 2014 15:02:34 +0000 (17:02 +0200)]
avformat/m4vdec: raise threshold slightly for detection

Fixes Ticket3746

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agohevc: parse display orientation SEI message
Vittorio Giovara [Wed, 2 Jul 2014 16:02:15 +0000 (12:02 -0400)]
hevc: parse display orientation SEI message

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agoh264: parse display orientation SEI message
Vittorio Giovara [Wed, 2 Jul 2014 15:58:19 +0000 (11:58 -0400)]
h264: parse display orientation SEI message

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agodisplay: add matrix flip api
Vittorio Giovara [Wed, 18 Jun 2014 22:08:20 +0000 (18:08 -0400)]
display: add matrix flip api

4 years agoavcodec/mpegvideo: clip mv visualization arrows so that their direction is maintained
Michael Niedermayer [Wed, 9 Jul 2014 13:53:23 +0000 (15:53 +0200)]
avcodec/mpegvideo: clip mv visualization arrows so that their direction is maintained

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc: mention option to mix shared/static libraries
Andrew Kelley [Thu, 3 Jul 2014 20:22:33 +0000 (16:22 -0400)]
doc: mention option to mix shared/static libraries

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
4 years agortpdec: pass an AVFormatContext to ff_parse_fmtp()
Anton Khirnov [Sat, 5 Jul 2014 07:01:07 +0000 (07:01 +0000)]
rtpdec: pass an AVFormatContext to ff_parse_fmtp()

Use it for logging, instead of NULL or the stream codec context.

4 years agoyuv4mpegenc: do not access AVCodecContext.coded_frame
Anton Khirnov [Sat, 5 Jul 2014 06:44:00 +0000 (06:44 +0000)]
yuv4mpegenc: do not access AVCodecContext.coded_frame

Its contents are meaningful only if the stream codec context is the one
actually used for encoding, which is often not the case (and is
discouraged).

Use AVCodecContext.field_order instead.

4 years agonsvdec: remove commented out cruft
Anton Khirnov [Thu, 19 Jun 2014 07:13:19 +0000 (09:13 +0200)]
nsvdec: remove commented out cruft

4 years agomov: free the dv demux context with avformat_free_context()
Anton Khirnov [Thu, 19 Jun 2014 06:56:24 +0000 (08:56 +0200)]
mov: free the dv demux context with avformat_free_context()

4 years agomtv: do not set sample_rate for video
Anton Khirnov [Sun, 15 Jun 2014 04:38:41 +0000 (06:38 +0200)]
mtv: do not set sample_rate for video

4 years agooggparsecelt: do not set AVCodecContext.frame_size
Anton Khirnov [Sun, 1 Jun 2014 08:19:47 +0000 (10:19 +0200)]
oggparsecelt: do not set AVCodecContext.frame_size

It is supposed to be set by decoders only.

4 years agoadxdec: get rid of an avpriv function
Anton Khirnov [Thu, 3 Jul 2014 19:01:59 +0000 (19:01 +0000)]
adxdec: get rid of an avpriv function

The only thing the demuxer needs is the sample rate to set the timebase,
which can be simply read with AV_RB32.

4 years agolavc: export DV profile API used by muxer/demuxer as public
Anton Khirnov [Sat, 5 Jul 2014 09:09:15 +0000 (09:09 +0000)]
lavc: export DV profile API used by muxer/demuxer as public

4 years agoavconv: set the output stream timebase
Anton Khirnov [Wed, 9 Jul 2014 10:33:03 +0000 (10:33 +0000)]
avconv: set the output stream timebase

This is required by the new API.

4 years agoavformat: update muxing doxy
Anton Khirnov [Wed, 9 Jul 2014 10:26:03 +0000 (10:26 +0000)]
avformat: update muxing doxy

The callers should now set the stream timebase, not the codec one.

4 years agocdg: set the keyframe flag on the first packet
Anton Khirnov [Fri, 4 Jul 2014 15:52:03 +0000 (15:52 +0000)]
cdg: set the keyframe flag on the first packet

Bug-Id: 55

4 years agoFix wmv1 encoding if all other msmpeg4-related encoders were disabled.
Carl Eugen Hoyos [Wed, 9 Jul 2014 06:51:17 +0000 (08:51 +0200)]
Fix wmv1 encoding if all other msmpeg4-related encoders were disabled.

4 years agoFix wmv1 decoding if no other msmpeg4-related decoder was compiled.
Carl Eugen Hoyos [Wed, 9 Jul 2014 06:27:24 +0000 (08:27 +0200)]
Fix wmv1 decoding if no other msmpeg4-related decoder was compiled.

4 years agoavcodec/mpegvideo: flip motion vector visualization for backward motion vectors
Michael Niedermayer [Wed, 9 Jul 2014 01:07:25 +0000 (03:07 +0200)]
avcodec/mpegvideo: flip motion vector visualization for backward motion vectors

Also support changing arrow head/tail shape

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavdevice/pulse_audio_dec: reimplement using the non simple API
Michael Niedermayer [Tue, 8 Jul 2014 02:28:33 +0000 (04:28 +0200)]
avdevice/pulse_audio_dec: reimplement using the non simple API

This fixes timestamps

Based-on: code from pulseaudio
Reviewed-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/movenc: respect color_range when encoding dnxhd.
Mark Boorer [Tue, 8 Jul 2014 21:09:57 +0000 (22:09 +0100)]
avformat/movenc: respect color_range when encoding dnxhd.

Set the ACLR atom appropriately for legal / full range.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/segment: remove gettimeofday() use, remove sys/time.h
Michael Niedermayer [Tue, 8 Jul 2014 20:51:16 +0000 (22:51 +0200)]
avformat/segment: remove gettimeofday() use, remove sys/time.h

It causes portability issues, and would need ifdef hell if its kept

Found-by: jamrial
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoalpha/idctdsp: move idct init code out of dsputil
James Almer [Tue, 8 Jul 2014 20:08:24 +0000 (17:08 -0300)]
alpha/idctdsp: move idct init code out of dsputil

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/mpegts: pass MpegTSContext ptr explicitly (fixes #3721)
Alexander V. Lukyanov [Tue, 8 Jul 2014 07:54:15 +0000 (11:54 +0400)]
avformat/mpegts: pass MpegTSContext ptr explicitly (fixes #3721)

AVFormatContext->priv_data is not always a MpegTSContext, it can be
RTSPState when decoding a RTP stream. So it is necessary to pass
MpegTSContext pointer explicitly.

This fixes memory corruption from bug #3721 (RTSPState is smaller than
MpegTSContext thus innocent memory gets overwritten).

Signed-off-by: Alexander V. Lukyanov <lavv17f@gmail.com>
Reviewed-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294'
Michael Niedermayer [Tue, 8 Jul 2014 19:53:09 +0000 (21:53 +0200)]
Merge commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294'

* commit '18fb38fb9ea7e2d5997c096fccfcd4cb43f70294':
  mov: Remove a variable that is set but never used

Conflicts:
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'cf280ed004b5c618560f8f43d14ff264bd1e4c3d'
Michael Niedermayer [Tue, 8 Jul 2014 19:38:17 +0000 (21:38 +0200)]
Merge commit 'cf280ed004b5c618560f8f43d14ff264bd1e4c3d'

* commit 'cf280ed004b5c618560f8f43d14ff264bd1e4c3d':
  avplay: Handle pixel aspect ratio properly

See: 32fdfdfbdac64c57b12910521af1379a24d01f73
See: 99b01e458c268cf18ac0981e644e0f835957498a
See: 825ec16da955fd9c726d8e6c846cf9257a781a87
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '52a1c32c0a86e84d43f977c5148e62975a0c6917'
Michael Niedermayer [Tue, 8 Jul 2014 19:08:01 +0000 (21:08 +0200)]
Merge commit '52a1c32c0a86e84d43f977c5148e62975a0c6917'

* commit '52a1c32c0a86e84d43f977c5148e62975a0c6917':
  nut: Use nut->version in the version range check

Conflicts:
libavformat/nutdec.c

Note, this bug did not affect ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavdevice/lavfi: add io.h, should fix msvc build
Michael Niedermayer [Tue, 8 Jul 2014 18:29:59 +0000 (20:29 +0200)]
avdevice/lavfi: add io.h, should fix msvc build

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/alpha/dsputil_alpha: fix build
Michael Niedermayer [Tue, 8 Jul 2014 18:15:31 +0000 (20:15 +0200)]
avcodec/alpha/dsputil_alpha: fix build

Disable moved functions to prevent build/test failure,
patch to update and re-enable them is welcome
volunteer to maintain the alpha code is welcome too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agomov: Remove a variable that is set but never used
Martin Storsjö [Mon, 7 Jul 2014 19:07:49 +0000 (22:07 +0300)]
mov: Remove a variable that is set but never used

This silences a warning with gcc.

Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavplay: Handle pixel aspect ratio properly
Martin Storsjö [Sun, 6 Jul 2014 20:18:27 +0000 (23:18 +0300)]
avplay: Handle pixel aspect ratio properly

This was broken (left half-implemented) in 354468fc12.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agonut: Use nut->version in the version range check
Luca Barbato [Mon, 7 Jul 2014 18:48:34 +0000 (20:48 +0200)]
nut: Use nut->version in the version range check

It was wrongly left unchanged when the version field had been
introduced. (c94e2e85cb6af8a570d8542a830556243bd32873)

4 years agoavcodec/proresenc_anatoliy: check against maximum dimensions
Michael Niedermayer [Tue, 8 Jul 2014 16:03:11 +0000 (18:03 +0200)]
avcodec/proresenc_anatoliy: check against maximum dimensions

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/roqvideoenc: check dimensions against maximum
Michael Niedermayer [Tue, 8 Jul 2014 15:33:39 +0000 (17:33 +0200)]
avcodec/roqvideoenc: check dimensions against maximum

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/roqvideoenc: fix infinite lambda increasing loop
Michael Niedermayer [Tue, 8 Jul 2014 15:05:27 +0000 (17:05 +0200)]
avcodec/roqvideoenc: fix infinite lambda increasing loop

The threshold was choosen so that no further size decrease happened with larger lambda
with the test video.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/nutdec: if all else fails try to lookup video tag in isom
Michael Niedermayer [Tue, 8 Jul 2014 14:26:23 +0000 (16:26 +0200)]
avformat/nutdec: if all else fails try to lookup video tag in isom

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavformat/movenc: check that the video resolution is supported
Michael Niedermayer [Tue, 8 Jul 2014 14:17:44 +0000 (16:17 +0200)]
avformat/movenc: check that the video resolution is supported

Resolutions are stored as 16bit integers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '79fce1ec8abd017593c003917fc123f7119a78d6'
Michael Niedermayer [Tue, 8 Jul 2014 12:44:12 +0000 (14:44 +0200)]
Merge commit '79fce1ec8abd017593c003917fc123f7119a78d6'

* commit '79fce1ec8abd017593c003917fc123f7119a78d6':
  arm: Avoid using the 'setend' instruction on ARMv7 and newer

Conflicts:
libavcodec/arm/h264dsp_init_arm.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit '3d90f27ad5843ccd63d34fd6da4d4bff212c1bfe'
Michael Niedermayer [Tue, 8 Jul 2014 12:27:52 +0000 (14:27 +0200)]
Merge commit '3d90f27ad5843ccd63d34fd6da4d4bff212c1bfe'

* commit '3d90f27ad5843ccd63d34fd6da4d4bff212c1bfe':
  avformat_new_stream: make the AVCodec parameter const

Conflicts:
libavformat/utils.c

See: e12cfd044c2bae4a099a3b9384b148424858d72b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoMerge commit 'd3cfd7aff86ee3d449ca68aba21d67b9b2136a9b'
Michael Niedermayer [Tue, 8 Jul 2014 11:20:08 +0000 (13:20 +0200)]
Merge commit 'd3cfd7aff86ee3d449ca68aba21d67b9b2136a9b'

* commit 'd3cfd7aff86ee3d449ca68aba21d67b9b2136a9b':
  af_compand: make sure request_frame always outputs at least one frame

See: 6b68e2a43b3407522080be50a2a19cff2f9715ef
Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoarm: Avoid using the 'setend' instruction on ARMv7 and newer
Martin Storsjö [Fri, 4 Jul 2014 15:21:50 +0000 (18:21 +0300)]
arm: Avoid using the 'setend' instruction on ARMv7 and newer

This instruction is deprecated on ARMv8, and it is serializing on
some ARMv7 cores as well [1].

[1] http://article.gmane.org/gmane.linux.ports.arm.kernel/339293

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
4 years agoavformat_new_stream: make the AVCodec parameter const
Roman Savchenko [Tue, 8 Jul 2014 08:24:09 +0000 (08:24 +0000)]
avformat_new_stream: make the AVCodec parameter const

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agoaf_compand: make sure request_frame always outputs at least one frame
Andrew Kelley [Sun, 6 Jul 2014 05:24:43 +0000 (22:24 -0700)]
af_compand: make sure request_frame always outputs at least one frame

This fixes a segmentation fault because request_frame in fifo.c assumes
that the call to ff_request_frame will populate fifo->root.next.
Before, it was possible for request_frame in af_compand to not do this,
resulting in a null pointer access. Now, request_frame in af_compand
always will return at least one frame or an error, as per the API
specifications in avfilter.h for request_frame.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
4 years agoMerge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3'
Michael Niedermayer [Tue, 8 Jul 2014 01:12:10 +0000 (03:12 +0200)]
Merge commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3'

* commit 'a9aee08d900f686e966c64afec5d88a7d9d130a3':
  dsputil: Split off FDCT bits into their own context

Conflicts:
configure
libavcodec/Makefile
libavcodec/asvenc.c
libavcodec/dnxhdenc.c
libavcodec/dsputil.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/x86/Makefile
libavcodec/x86/dsputilenc_mmx.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/crystalhd: Add #if HAVE_UNISTD_H around #include <unistd.h>
Michael Niedermayer [Tue, 8 Jul 2014 00:48:51 +0000 (02:48 +0200)]
avcodec/crystalhd: Add #if HAVE_UNISTD_H around  #include <unistd.h>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavutil/cpu: Use HAVE_UNISTD_H instead of HAVE_SYSCONF for #include <unistd.h>
Michael Niedermayer [Tue, 8 Jul 2014 00:50:24 +0000 (02:50 +0200)]
avutil/cpu: Use HAVE_UNISTD_H instead of HAVE_SYSCONF for #include <unistd.h>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavfilter/vf_drawtext: Add #if HAVE_UNISTD_H around #include <unistd.h>
Michael Niedermayer [Tue, 8 Jul 2014 00:48:51 +0000 (02:48 +0200)]
avfilter/vf_drawtext: Add #if HAVE_UNISTD_H around  #include <unistd.h>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavdevice/oss_audio: Add #if HAVE_UNISTD_H around #include <unistd.h>
Michael Niedermayer [Tue, 8 Jul 2014 00:48:51 +0000 (02:48 +0200)]
avdevice/oss_audio: Add #if HAVE_UNISTD_H around  #include <unistd.h>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc: add doxygen target tag
Timothy Gu [Mon, 7 Jul 2014 22:24:49 +0000 (15:24 -0700)]
doc: add doxygen target tag

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc: make doxygen program configurable
Timothy Gu [Mon, 7 Jul 2014 22:24:48 +0000 (15:24 -0700)]
doc: make doxygen program configurable

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agodoc: add doxy-wrapper.sh to doc/doxygen/html dependencies
Timothy Gu [Mon, 7 Jul 2014 22:24:47 +0000 (15:24 -0700)]
doc: add doxy-wrapper.sh to doc/doxygen/html dependencies

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoffserver: add HAVE_UNISTD_H around #include <unistd.h>
Michael Niedermayer [Mon, 7 Jul 2014 23:55:47 +0000 (01:55 +0200)]
ffserver: add HAVE_UNISTD_H around #include <unistd.h>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agotools/yuvcmp: add HAVE_UNISTD_H around #include <unistd.h>
Michael Niedermayer [Mon, 7 Jul 2014 23:55:47 +0000 (01:55 +0200)]
tools/yuvcmp: add HAVE_UNISTD_H around #include <unistd.h>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoavcodec/libxvid: add HAVE_UNISTD_H around #include <unistd.h>
Michael Niedermayer [Mon, 7 Jul 2014 23:55:47 +0000 (01:55 +0200)]
avcodec/libxvid: add HAVE_UNISTD_H around #include <unistd.h>

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoprotect unistd.h with #if HAVE_UNISTD_H in code from recent av_bprint_fd_contents...
Michael Niedermayer [Mon, 7 Jul 2014 23:45:43 +0000 (01:45 +0200)]
protect unistd.h with #if HAVE_UNISTD_H in code from recent av_bprint_fd_contents() patches

Should fix build failure on MSVC

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
4 years agoswresample: misc. doxy improvements
Timothy Gu [Mon, 7 Jul 2014 22:23:49 +0000 (15:23 -0700)]
swresample: misc. doxy improvements

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>