ffmpeg.git
6 years agoMerge commit '67f2a688143b644f99360565a9f36c61a5f052e9'
Michael Niedermayer [Mon, 24 Feb 2014 20:08:19 +0000 (21:08 +0100)]
Merge commit '67f2a688143b644f99360565a9f36c61a5f052e9'

* commit '67f2a688143b644f99360565a9f36c61a5f052e9':
  avconv: remove a write-only variable

Conflicts:
ffmpeg.c
ffmpeg.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8aca00cc2b25810bdd85b75f5632844a5614b707'
Michael Niedermayer [Mon, 24 Feb 2014 20:05:09 +0000 (21:05 +0100)]
Merge commit '8aca00cc2b25810bdd85b75f5632844a5614b707'

* commit '8aca00cc2b25810bdd85b75f5632844a5614b707':
  libx265: Properly handled dynamic linking with MSVC

See: 87769d6c8f6d71e4814821f7e6f57b4b65eaf2a7
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '0f7fa48cf1a36ed135c9e0cb01a6b84179aea25b'
Michael Niedermayer [Mon, 24 Feb 2014 20:03:25 +0000 (21:03 +0100)]
Merge commit '0f7fa48cf1a36ed135c9e0cb01a6b84179aea25b'

* commit '0f7fa48cf1a36ed135c9e0cb01a6b84179aea25b':
  libx265: Support SAR

See: 73ee4cf3073bd3b98580cd0b31521972746bd2d4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2142b2efcd631db05e4c7c26785e337ecf1258ff'
Michael Niedermayer [Mon, 24 Feb 2014 20:02:06 +0000 (21:02 +0100)]
Merge commit '2142b2efcd631db05e4c7c26785e337ecf1258ff'

* commit '2142b2efcd631db05e4c7c26785e337ecf1258ff':
  libx265: Support 4:4:4

See: d102925a6d4ac1c6fb901fe2df052811e5814d60
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd00a504b244e136a0c82a55e21ed94659e0674ad'
Michael Niedermayer [Mon, 24 Feb 2014 19:40:52 +0000 (20:40 +0100)]
Merge commit 'd00a504b244e136a0c82a55e21ed94659e0674ad'

* commit 'd00a504b244e136a0c82a55e21ed94659e0674ad':
  libx265: Update API usage

Conflicts:
libavcodec/libx265.c

See: d3736471948cd06851f6b3aef352ef285b7c6480
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/options_table: add named constants for avoid_negative_ts
Michael Niedermayer [Sat, 22 Feb 2014 21:44:37 +0000 (22:44 +0100)]
avformat/options_table: add named constants for avoid_negative_ts

Idea-by: ubitux
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavconv: remove a write-only variable
Anton Khirnov [Wed, 19 Feb 2014 15:16:43 +0000 (16:16 +0100)]
avconv: remove a write-only variable

6 years agolibx265: Use proper error code
Derek Buitenhuis [Fri, 21 Feb 2014 17:13:56 +0000 (12:13 -0500)]
libx265: Use proper error code

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolibx265: Properly handled dynamic linking with MSVC
Derek Buitenhuis [Fri, 21 Feb 2014 17:11:00 +0000 (12:11 -0500)]
libx265: Properly handled dynamic linking with MSVC

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolibx265: Support SAR
Derek Buitenhuis [Fri, 21 Feb 2014 17:05:50 +0000 (12:05 -0500)]
libx265: Support SAR

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolibx265: Support 4:4:4
Derek Buitenhuis [Fri, 21 Feb 2014 16:59:13 +0000 (11:59 -0500)]
libx265: Support 4:4:4

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolibx265: Update API usage
Derek Buitenhuis [Fri, 21 Feb 2014 16:26:40 +0000 (11:26 -0500)]
libx265: Update API usage

Framerate is now a sane rational instead of an integer, and
inputDepth is changed to what it actually is.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolibx265: Properly handled dynamic linking with MSVC
Derek Buitenhuis [Fri, 21 Feb 2014 17:11:00 +0000 (12:11 -0500)]
libx265: Properly handled dynamic linking with MSVC

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolibx265: Support SAR
Derek Buitenhuis [Fri, 21 Feb 2014 17:05:50 +0000 (12:05 -0500)]
libx265: Support SAR

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolibx265: Support 4:4:4
Derek Buitenhuis [Fri, 21 Feb 2014 16:59:13 +0000 (11:59 -0500)]
libx265: Support 4:4:4

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolibx265: Update API usage
Derek Buitenhuis [Fri, 21 Feb 2014 16:26:40 +0000 (11:26 -0500)]
libx265: Update API usage

Framerate is now a sane rational instead of an integer, and
inputDepth is changed to what it actually is.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 24 Feb 2014 09:47:47 +0000 (10:47 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Use av_frame_copy() to simplify code where appropriate.

Conflicts:
libavfilter/vf_copy.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8feac29cc46270cc89d6016340e7bac780877131'
Michael Niedermayer [Mon, 24 Feb 2014 09:15:16 +0000 (10:15 +0100)]
Merge commit '8feac29cc46270cc89d6016340e7bac780877131'

* commit '8feac29cc46270cc89d6016340e7bac780877131':
  lavc: use AVFrame API properly in ff_reget_buffer()

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/frame_copy_audio: also check that channels match
Michael Niedermayer [Mon, 24 Feb 2014 08:52:13 +0000 (09:52 +0100)]
avutil/frame_copy_audio: also check that channels match

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1155fd02ae7bac215acab316e847c6bb25f74fc3'
Michael Niedermayer [Mon, 24 Feb 2014 08:37:14 +0000 (09:37 +0100)]
Merge commit '1155fd02ae7bac215acab316e847c6bb25f74fc3'

* commit '1155fd02ae7bac215acab316e847c6bb25f74fc3':
  frame: add a convenience function for copying AVFrame data

Conflicts:
doc/APIchanges
libavutil/frame.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '746dca483a2f0f2639265f6e1c0085c8861875a1'
Michael Niedermayer [Mon, 24 Feb 2014 07:53:13 +0000 (08:53 +0100)]
Merge commit '746dca483a2f0f2639265f6e1c0085c8861875a1'

* commit '746dca483a2f0f2639265f6e1c0085c8861875a1':
  avconv: support forcing codec tags for input streams

Conflicts:
doc/ffmpeg.texi

See: 6bca574a98ba604459f6ee92538b19d25bba0973
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: Move XOP emulation to x86util
James Almer [Mon, 24 Feb 2014 05:34:38 +0000 (02:34 -0300)]
x86: Move XOP emulation to x86util

We need the emulation to support the cases where the first
argument is the same as the fourth. To achieve this a fifth
argument working as a temporary may be needed.
Emulation that doesn't obey the original instruction semantics
can't be in x86inc.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswr: check that the context for swr_convert() has been initialized
Michael Niedermayer [Sat, 22 Feb 2014 21:29:51 +0000 (22:29 +0100)]
swr: check that the context for swr_convert() has been initialized

Reviewed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswresample: add swr_is_initialized()
Michael Niedermayer [Sat, 22 Feb 2014 21:28:24 +0000 (22:28 +0100)]
swresample: add swr_is_initialized()

Idea-from/based-on: 7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731
Reviewed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoUse av_frame_copy() to simplify code where appropriate.
Anton Khirnov [Tue, 11 Feb 2014 14:08:12 +0000 (15:08 +0100)]
Use av_frame_copy() to simplify code where appropriate.

6 years agolavc: use AVFrame API properly in ff_reget_buffer()
Anton Khirnov [Tue, 11 Feb 2014 13:59:00 +0000 (14:59 +0100)]
lavc: use AVFrame API properly in ff_reget_buffer()

6 years agoframe: add a convenience function for copying AVFrame data
Anton Khirnov [Tue, 11 Feb 2014 13:15:20 +0000 (14:15 +0100)]
frame: add a convenience function for copying AVFrame data

6 years agoavconv: support forcing codec tags for input streams
Anton Khirnov [Sun, 23 Feb 2014 07:05:52 +0000 (08:05 +0100)]
avconv: support forcing codec tags for input streams

6 years agooggdec: validate VP8 keyframes
James Almer [Thu, 9 Jan 2014 22:17:50 +0000 (19:17 -0300)]
oggdec: validate VP8 keyframes

Fixes seeking with broken files

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 23 Feb 2014 21:52:42 +0000 (22:52 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: add detection for Bit Manipulation Instruction sets

Conflicts:
libavutil/x86/cpu.c

See: 0bc3de19ffe296254f214dc7615e624d8e401bcb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1b932eb1508f550fac9e911923a0383efda53aa3'
Michael Niedermayer [Sun, 23 Feb 2014 21:42:43 +0000 (22:42 +0100)]
Merge commit '1b932eb1508f550fac9e911923a0383efda53aa3'

* commit '1b932eb1508f550fac9e911923a0383efda53aa3':
  x86: add detection for FMA3 instruction set

Conflicts:
configure
libavutil/cpu.h
libavutil/x86/cpu.c

See: a2af8eddab75f1eac712411e4dde89823c0845e8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '10b0161d78148f46eaffb29ea022378947eaef2c'
Michael Niedermayer [Sun, 23 Feb 2014 21:32:51 +0000 (22:32 +0100)]
Merge commit '10b0161d78148f46eaffb29ea022378947eaef2c'

* commit '10b0161d78148f46eaffb29ea022378947eaef2c':
  x86: add missing XOP checks and macros

Conflicts:
configure
libavutil/x86/cpu.h

See: 6c12b1de064d2604d19cb4c238a788cfed9679ac
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5800ba0db667630e6ff81d30f03961ea10726aa6'
Michael Niedermayer [Sun, 23 Feb 2014 21:25:08 +0000 (22:25 +0100)]
Merge commit '5800ba0db667630e6ff81d30f03961ea10726aa6'

* commit '5800ba0db667630e6ff81d30f03961ea10726aa6':
  configure: disable cpunop if the check fails

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Move cpunop into ARCH_EXT_LIST_X86
Diego Biurrun [Sat, 2 Nov 2013 16:21:52 +0000 (17:21 +0100)]
configure: Move cpunop into ARCH_EXT_LIST_X86

It is a processor feature, so it belongs there.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8eeacf31c5ea37baf6b222dc38d20cf4fd33c455'
Michael Niedermayer [Sun, 23 Feb 2014 21:17:19 +0000 (22:17 +0100)]
Merge commit '8eeacf31c5ea37baf6b222dc38d20cf4fd33c455'

* commit '8eeacf31c5ea37baf6b222dc38d20cf4fd33c455':
  hevc: Do not left shift a negative value in hevc_loop_filter_chroma

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ff486c0f7f6b2ace3f0238660bc06cc35b389676'
Michael Niedermayer [Sun, 23 Feb 2014 21:10:58 +0000 (22:10 +0100)]
Merge commit 'ff486c0f7f6b2ace3f0238660bc06cc35b389676'

* commit 'ff486c0f7f6b2ace3f0238660bc06cc35b389676':
  hevc: Do not right shift a negative value in get_pcm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '50c988aa6d6c6f0ceb8f922bcea34800b56b85d9'
Michael Niedermayer [Sun, 23 Feb 2014 21:02:45 +0000 (22:02 +0100)]
Merge commit '50c988aa6d6c6f0ceb8f922bcea34800b56b85d9'

* commit '50c988aa6d6c6f0ceb8f922bcea34800b56b85d9':
  hevc: Drop unnecessary shifts in deblocking_filter_CTB

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/pngenc: fix invalid read in sub filter.
Clément Bœsch [Sun, 23 Feb 2014 19:11:30 +0000 (20:11 +0100)]
avcodec/pngenc: fix invalid read in sub filter.

First pixel was computed based on invalid address read, and then
corrected by the following memcpy. After the commit, it's not computed
anymore, and memcpy fills the appropriate area.

Fixes Ticket #3387

6 years agoavcodec/h264: clear chroma planes when flags gray is used
Michael Niedermayer [Sun, 23 Feb 2014 17:20:05 +0000 (18:20 +0100)]
avcodec/h264: clear chroma planes when flags gray is used

Fixes Ticket3397
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mpegvideo: fix buffer clear code so it should work with negative linesizes
Michael Niedermayer [Sun, 23 Feb 2014 17:14:59 +0000 (18:14 +0100)]
avcodec/mpegvideo: fix buffer clear code so it should work with negative linesizes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: add detection for Bit Manipulation Instruction sets
James Almer [Sat, 22 Feb 2014 04:54:02 +0000 (04:54 +0000)]
x86: add detection for Bit Manipulation Instruction sets

Based on x264 code

Signed-off-by: James Almer <jamrial@gmail.com>
6 years agox86: add detection for FMA3 instruction set
James Almer [Sat, 22 Feb 2014 04:54:01 +0000 (04:54 +0000)]
x86: add detection for FMA3 instruction set

Based on x264 code

Signed-off-by: James Almer <jamrial@gmail.com>
6 years agox86: add missing XOP checks and macros
James Almer [Sat, 22 Feb 2014 04:54:00 +0000 (04:54 +0000)]
x86: add missing XOP checks and macros

Signed-off-by: James Almer <jamrial@gmail.com>
6 years agoconfigure: disable cpunop if the check fails
Janne Grunau [Sun, 23 Feb 2014 13:09:06 +0000 (14:09 +0100)]
configure: disable cpunop if the check fails

Moving cpunop from the HAVE_LIST to the ARCH_EXT_LIST_X86 has the side
effect of enabling it. The semantics of the check have to be changed
from enable if successful to disable if unsuccessful. This was missing
in 2b0bb69997c2416e74f41aa1400ce983bf8775c0 causing build errors with
nasm.

6 years agohevc: Do not left shift a negative value in hevc_loop_filter_chroma
Luca Barbato [Wed, 19 Feb 2014 20:56:35 +0000 (21:56 +0100)]
hevc: Do not left shift a negative value in hevc_loop_filter_chroma

6 years agohevc: Do not right shift a negative value in get_pcm
Luca Barbato [Wed, 19 Feb 2014 21:21:43 +0000 (22:21 +0100)]
hevc: Do not right shift a negative value in get_pcm

6 years agohevc: Drop unnecessary shifts in deblocking_filter_CTB
Luca Barbato [Wed, 19 Feb 2014 19:38:53 +0000 (20:38 +0100)]
hevc: Drop unnecessary shifts in deblocking_filter_CTB

beta_offset is pre-multiplied by 2.

6 years agoAdd more Bayer colour spaces to the video4linux2 device wrapper.
Carl Eugen Hoyos [Sun, 23 Feb 2014 09:47:18 +0000 (10:47 +0100)]
Add more Bayer colour spaces to the video4linux2 device wrapper.

6 years agoavdevice/v4l2: add V4L2_PIX_FMT_SRGGB8
Peter Ross [Sat, 22 Feb 2014 12:42:15 +0000 (23:42 +1100)]
avdevice/v4l2: add V4L2_PIX_FMT_SRGGB8

6 years agoIssue-#3407 : Enhance precision for double to string conversion, useful for GEOTIFF...
Sylvain Fabre [Sun, 23 Feb 2014 09:30:37 +0000 (10:30 +0100)]
Issue-#3407 : Enhance precision for double to string conversion, useful for GEOTIFF double values

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibswscale: bayer to rgb24 & yv12 colorspace converters
Peter Ross [Sun, 23 Feb 2014 01:18:57 +0000 (12:18 +1100)]
libswscale: bayer to rgb24 & yv12 colorspace converters

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/rawdec: for 16-bit pix fmts, shift pixels when bits_per_coded_sample < 16
Peter Ross [Sun, 23 Feb 2014 01:18:42 +0000 (12:18 +1100)]
avcodec/rawdec: for 16-bit pix fmts, shift pixels when bits_per_coded_sample < 16

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/pixdesc: set bayer pixfmt descriptor flags
Peter Ross [Sun, 23 Feb 2014 01:18:33 +0000 (12:18 +1100)]
avutil/pixdesc: set bayer pixfmt descriptor flags

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Revert commit 5176e9651bda5182df008a1226e2484fdd809985
Dave Yeo [Sun, 23 Feb 2014 00:04:43 +0000 (16:04 -0800)]
configure: Revert commit 5176e9651bda5182df008a1226e2484fdd809985

This fixes cpunop detection and unbreaks NASM assembly

Signed-off-by: Dave Yeo <daveryeo@telus.net>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoSupport old qclp-in-mov files that do not store bytes_per_frame in the header.
Carl Eugen Hoyos [Sat, 22 Feb 2014 23:41:53 +0000 (00:41 +0100)]
Support old qclp-in-mov files that do not store bytes_per_frame in the header.

Fixes ticket #2649.

6 years agoSupport MPEG-2 video mov files with sample description mp2v.
Carl Eugen Hoyos [Sat, 22 Feb 2014 23:31:50 +0000 (00:31 +0100)]
Support MPEG-2 video mov files with sample description mp2v.

6 years agoavformat/movenc: shift positive timestamps to 0 if edit lists cannot be used
Michael Niedermayer [Fri, 21 Feb 2014 01:48:39 +0000 (02:48 +0100)]
avformat/movenc: shift positive timestamps to 0 if edit lists cannot be used

Fix handling of timestamps which start  far away from 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mux: support shifting timestamps so they start at 0
Michael Niedermayer [Fri, 21 Feb 2014 01:43:04 +0000 (02:43 +0100)]
avformat/mux: support shifting timestamps so they start at 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoswresample: factorize clear_context() out
Michael Niedermayer [Sat, 22 Feb 2014 20:36:30 +0000 (21:36 +0100)]
swresample: factorize clear_context() out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 22 Feb 2014 20:11:59 +0000 (21:11 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavr: return an error if a avresample_open() is called on an open context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731'
Michael Niedermayer [Sat, 22 Feb 2014 20:05:58 +0000 (21:05 +0100)]
Merge commit '7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731'

* commit '7e86c27b4ee9e5a3fbe6cf5249b9d918b2a5e731':
  lavr: add a function for checking whether AVAudioResampleContext is open

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavr: return an error if a avresample_open() is called on an open context
Anton Khirnov [Thu, 25 Apr 2013 18:12:47 +0000 (20:12 +0200)]
lavr: return an error if a avresample_open() is called on an open context

6 years agolavr: add a function for checking whether AVAudioResampleContext is open
Anton Khirnov [Thu, 25 Apr 2013 18:08:49 +0000 (20:08 +0200)]
lavr: add a function for checking whether AVAudioResampleContext is open

6 years agoavformat/nut: add bayer colorspaces
Peter Ross [Sat, 22 Feb 2014 12:41:59 +0000 (23:41 +1100)]
avformat/nut: add bayer colorspaces

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/raw: add bayer formats
Peter Ross [Sat, 22 Feb 2014 12:41:41 +0000 (23:41 +1100)]
avcodec/raw: add bayer formats

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: add detection for Bit Manipulation Instruction sets
James Almer [Sat, 22 Feb 2014 05:47:02 +0000 (02:47 -0300)]
x86: add detection for Bit Manipulation Instruction sets

Based on x264 code

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agox86: add detection for FMA3 instruction set
James Almer [Sat, 22 Feb 2014 05:47:01 +0000 (02:47 -0300)]
x86: add detection for FMA3 instruction set

Based on x264 code

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 22 Feb 2014 14:41:10 +0000 (15:41 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: Fix a typo from the previous commit

See: 76dd01ecd4ed51e0669773470ee0d8db2c2e4d3f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/utils: compute_pkt_fields: Fix DTS for the case where has_b_frames is too...
Michael Niedermayer [Sat, 22 Feb 2014 12:04:18 +0000 (13:04 +0100)]
avformat/utils: compute_pkt_fields: Fix DTS for the case where has_b_frames is too large but the correct one is constant

Fixes issue1.m2ts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/utils: reset pts_buffer in estimate_timings_from_pts()
Michael Niedermayer [Sat, 22 Feb 2014 13:22:31 +0000 (14:22 +0100)]
avformat/utils: reset pts_buffer in estimate_timings_from_pts()

This fixes the first few dts after find_stream_info

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/utils: factorize h264/hevc checks out in compute_pkt_fields()
Michael Niedermayer [Sat, 22 Feb 2014 11:21:28 +0000 (12:21 +0100)]
avformat/utils: factorize h264/hevc checks out in compute_pkt_fields()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoSDR2 demuxer
Paul B Mahol [Thu, 16 Jan 2014 14:25:38 +0000 (14:25 +0000)]
SDR2 demuxer

Signed-off-by: Paul B Mahol <onemda@gmail.com>
6 years agoh264: Fix a typo from the previous commit
Luca Barbato [Sat, 22 Feb 2014 10:19:03 +0000 (11:19 +0100)]
h264: Fix a typo from the previous commit

f777504f640260337974848c7d5d7a3f064bbb45 changed a - in +

CC: libav-stable@libav.org
6 years agoFix FSF address in colormatrix and libzvbi license headers.
Carl Eugen Hoyos [Sat, 22 Feb 2014 10:17:56 +0000 (11:17 +0100)]
Fix FSF address in colormatrix and libzvbi license headers.

As reported by irc user aca.
The files in compat/avisynth are maintained elsewhere, no changes.

6 years agoavcodec/h264_ps: fix printed num_reorder_frames value
Michael Niedermayer [Sat, 22 Feb 2014 01:55:55 +0000 (02:55 +0100)]
avcodec/h264_ps: fix printed num_reorder_frames value

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h264: use subsample factors of the used pixel format
Michael Niedermayer [Fri, 21 Feb 2014 22:51:33 +0000 (23:51 +0100)]
avcodec/h264: use subsample factors of the used pixel format

Fixes out of array read
Fixes: 1cb91c36c4e55463f14aacb9bdf55b38-asan_heap-oob_106cbce_5617_cov_11212800_h264_mmx_chroma_intra_lf.mp4
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 21 Feb 2014 20:14:37 +0000 (21:14 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mxf: Add DNxHD UL

See: 2ff540a0fe02c2d2588a7d2aa7820e66a615de95
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a9099e04026f300924ac363fa6f8aef912677d90'
Michael Niedermayer [Fri, 21 Feb 2014 19:49:54 +0000 (20:49 +0100)]
Merge commit 'a9099e04026f300924ac363fa6f8aef912677d90'

* commit 'a9099e04026f300924ac363fa6f8aef912677d90':
  mxf: Add uncompressed 422 8-bit rawvideo UL

Conflicts:
libavformat/mxf.c

See: 51d632cc8f4c8fa1556d7d8c18c5488700eb6154
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoqcelp: grammar
Reynaldo H. Verdejo Pinochet [Fri, 14 Feb 2014 20:42:23 +0000 (17:42 -0300)]
qcelp: grammar

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agoqcelpdec: break some too-long lines
Reynaldo H. Verdejo Pinochet [Fri, 14 Feb 2014 20:31:50 +0000 (17:31 -0300)]
qcelpdec: break some too-long lines

Signed-off-by: Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Fri, 21 Feb 2014 17:45:11 +0000 (18:45 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Do not warn about missing start time for unknown streams.
  Only complain about missing frame rate for video streams.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agotests/tiny_ssim: drop isatty() support
Michael Niedermayer [Fri, 21 Feb 2014 15:34:56 +0000 (16:34 +0100)]
tests/tiny_ssim: drop isatty() support

tiny_ssim is build on the host, not the target and the HAVE_* are set for the
target.
This patch fixes building tiny_ssim when HAVE_* differed between target and host

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoDo not warn about missing start time for unknown streams.
Carl Eugen Hoyos [Fri, 21 Feb 2014 16:27:37 +0000 (17:27 +0100)]
Do not warn about missing start time for unknown streams.

6 years agoOnly complain about missing frame rate for video streams.
Carl Eugen Hoyos [Fri, 21 Feb 2014 16:27:20 +0000 (17:27 +0100)]
Only complain about missing frame rate for video streams.

6 years agomxf: Add DNxHD UL
Tomas Härdin [Sat, 10 Mar 2012 16:03:00 +0000 (17:03 +0100)]
mxf: Add DNxHD UL

Note that the old DNxHD UL is actually JPEG 2000 according to RP224.
Leaving it as-is for now.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agomxf: Add uncompressed 422 8-bit rawvideo UL
Philip de Nier [Tue, 28 Feb 2012 14:16:37 +0000 (14:16 +0000)]
mxf: Add uncompressed 422 8-bit rawvideo UL

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 21 Feb 2014 12:53:24 +0000 (13:53 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libvorbis: Give consistent names to all functions, structs, and defines

Conflicts:
libavcodec/libvorbisenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibvorbis: Give consistent names to all functions, structs, and defines
Diego Biurrun [Fri, 21 Feb 2014 10:08:09 +0000 (11:08 +0100)]
libvorbis: Give consistent names to all functions, structs, and defines

6 years agoavformat/movenc: assert that get_cluster_duration() value is valid
Michael Niedermayer [Fri, 21 Feb 2014 01:15:58 +0000 (02:15 +0100)]
avformat/movenc: assert that get_cluster_duration() value is valid

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/movenc: check that the input timestamps are within the range that can be...
Michael Niedermayer [Fri, 21 Feb 2014 01:30:19 +0000 (02:30 +0100)]
avformat/movenc: check that the input timestamps are within the range that can be stored in mov

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/h264: fix sign error
Michael Niedermayer [Thu, 20 Feb 2014 23:33:23 +0000 (00:33 +0100)]
avcodec/h264: fix sign error

regression since f777504f640260337974848c7d5d7a3f064bbb45

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec: fix dxva2 & vaapi after removing the +52 offset from the loop filter parameters
Michael Niedermayer [Thu, 20 Feb 2014 23:21:22 +0000 (00:21 +0100)]
avcodec: fix dxva2 & vaapi after removing the +52 offset from the loop filter parameters

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Thu, 20 Feb 2014 23:19:07 +0000 (00:19 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: Lower bound check for slice offsets

Conflicts:
libavcodec/h264.c

See: 91253839e14cce9793ee93f184cef609ca8195d5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '5c79d2e12d13959fc6aed92d102c25194a06de05'
Michael Niedermayer [Thu, 20 Feb 2014 22:58:40 +0000 (23:58 +0100)]
Merge commit '5c79d2e12d13959fc6aed92d102c25194a06de05'

* commit '5c79d2e12d13959fc6aed92d102c25194a06de05':
  avconv: Do not divide by zero

Conflicts:
ffmpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd6a27f885b5d4cba7a82e50af423c741d2f37c3e'
Michael Niedermayer [Thu, 20 Feb 2014 22:38:30 +0000 (23:38 +0100)]
Merge commit 'd6a27f885b5d4cba7a82e50af423c741d2f37c3e'

* commit 'd6a27f885b5d4cba7a82e50af423c741d2f37c3e':
  configure: Add usan to the toolchain presets

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2b0bb69997c2416e74f41aa1400ce983bf8775c0'
Michael Niedermayer [Thu, 20 Feb 2014 22:27:13 +0000 (23:27 +0100)]
Merge commit '2b0bb69997c2416e74f41aa1400ce983bf8775c0'

* commit '2b0bb69997c2416e74f41aa1400ce983bf8775c0':
  configure: Move cpunop into ARCH_EXT_LIST_X86

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '6adf4290ebcf65ac8243d74f34ba0a508f561633'
Michael Niedermayer [Thu, 20 Feb 2014 22:18:02 +0000 (23:18 +0100)]
Merge commit '6adf4290ebcf65ac8243d74f34ba0a508f561633'

* commit '6adf4290ebcf65ac8243d74f34ba0a508f561633':
  configure: Move inet_aton check into network function check block

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9c029f67ca82147ddfa83a1546ee1e109e11fbd4'
Michael Niedermayer [Thu, 20 Feb 2014 22:13:06 +0000 (23:13 +0100)]
Merge commit '9c029f67ca82147ddfa83a1546ee1e109e11fbd4'

* commit '9c029f67ca82147ddfa83a1546ee1e109e11fbd4':
  aarch64: use EXTERN_ASM consistently for exported symbols

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '996697e266c8adc0ad9b7fc7568406c7529c97cf'
Michael Niedermayer [Thu, 20 Feb 2014 22:11:19 +0000 (23:11 +0100)]
Merge commit '996697e266c8adc0ad9b7fc7568406c7529c97cf'

* commit '996697e266c8adc0ad9b7fc7568406c7529c97cf':
  x86: float dsp: unroll SSE versions

See: 133b34207c2ca3ae214dfd429288ac6e31efa5dc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ef010f08ae53479c54e2f16be5a7e1a809a9e268'
Michael Niedermayer [Thu, 20 Feb 2014 22:07:15 +0000 (23:07 +0100)]
Merge commit 'ef010f08ae53479c54e2f16be5a7e1a809a9e268'

* commit 'ef010f08ae53479c54e2f16be5a7e1a809a9e268':
  dca: replace some memcpy by AV_COPY128

See: 5a48caa34b0c2a2641ea3bd522802fa1df2c8866
Merged-by: Michael Niedermayer <michaelni@gmx.at>