ffmpeg.git
5 years agoMerge commit '6a880090cd75b6c31b5ee1f088b6578a293099c6'
Michael Niedermayer [Mon, 8 Dec 2014 01:19:19 +0000 (02:19 +0100)]
Merge commit '6a880090cd75b6c31b5ee1f088b6578a293099c6'

* commit '6a880090cd75b6c31b5ee1f088b6578a293099c6':
  doc: Use the correct @subsection tag

See: cf3bfc970c7a567763aef4bf7ce827f84d692fd6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4fd7e63c87226584e60200b82630a6057c0a6663'
Michael Niedermayer [Mon, 8 Dec 2014 01:03:30 +0000 (02:03 +0100)]
Merge commit '4fd7e63c87226584e60200b82630a6057c0a6663'

* commit '4fd7e63c87226584e60200b82630a6057c0a6663':
  mp3: Tweak the probe scores

Conflicts:
libavformat/mp3dec.c

FFmpeg detects the file fine, and there is a non zero risk
that this change may lead to misdetections, thus not merged.
If someone has a mp3 file that is misdetected, please open a ticket

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4f5906a1d7f4368cec43b224e8a675f54d2001d2'
Michael Niedermayer [Mon, 8 Dec 2014 00:39:43 +0000 (01:39 +0100)]
Merge commit '4f5906a1d7f4368cec43b224e8a675f54d2001d2'

* commit '4f5906a1d7f4368cec43b224e8a675f54d2001d2':
  latm: Do not give a score for a single instance

Conflicts:
libavformat/rawdec.c

No change, the buggy case was not part of FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '71f29410e7c58f2ce4aef1d4b8d8d3c064c8ec06'
Michael Niedermayer [Mon, 8 Dec 2014 00:34:28 +0000 (01:34 +0100)]
Merge commit '71f29410e7c58f2ce4aef1d4b8d8d3c064c8ec06'

* commit '71f29410e7c58f2ce4aef1d4b8d8d3c064c8ec06':
  lavfi: Increase drawtext font size limits

Conflicts:
libavfilter/vf_drawtext.c

See: b87d4c2b9f4106045afeabe1f1338c3eddb66935
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoImprove configure help text.
Carl Eugen Hoyos [Sun, 7 Dec 2014 23:33:21 +0000 (00:33 +0100)]
Improve configure help text.

Show which features external libraries enable.
Fixes ticket #4157

5 years agoFix xcb 32bit pix_fmts: There is no screen transparency.
Carl Eugen Hoyos [Sun, 7 Dec 2014 23:31:01 +0000 (00:31 +0100)]
Fix xcb 32bit pix_fmts: There is no screen transparency.

5 years agoavformat/matroskadec: request a sample with recursive seek heads
Michael Niedermayer [Sun, 7 Dec 2014 21:45:34 +0000 (22:45 +0100)]
avformat/matroskadec: request a sample with recursive seek heads

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/matroskadec: fix handling of recursive SeekHead elements
wm4 [Sat, 6 Dec 2014 15:53:30 +0000 (16:53 +0100)]
avformat/matroskadec: fix handling of recursive SeekHead elements

When matroska_execute_seekhead() is called, it goes through the list of
seekhead entries and attempts to read elements not read yet. When doing
this, the parser can find further SeekHead elements, and will extend the
matroska->seekhead list. This can lead to a (practically) infinite loop
with certain broken files. (Maybe it can happen even with valid files.
The demuxer doesn't seem to check correctly whether an element has
already been read.)

Fix this by ignoring elements that were added to the seekhead field
during executing seekhead entries.

This does not fix the possible situation when multiple SeekHead elements
after the file header (i.e. occur after the "before_pos" file position)
point to the same elements. These elements will probably be parsed
multiple times, likely leading to bugs.

Fixes ticket #4162.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc: Use the correct @subsection tag
Luca Barbato [Sun, 7 Dec 2014 17:38:56 +0000 (18:38 +0100)]
doc: Use the correct @subsection tag

makeinfo would otherwise refuse to build it.

5 years agomp3: Tweak the probe scores
Luca Barbato [Sat, 6 Dec 2014 11:32:25 +0000 (12:32 +0100)]
mp3: Tweak the probe scores

Having more than 10 consecutive frames decoded as mp3 should be
considered a clear signal that the sample is mp3 and not mpegps.

Reported-By: Florian Iragne <florian@iragne.fr>
CC: libav-stable@libav.org
5 years agodoc/filters: Add ascii graphics to clarify what the currently implemented tinterlace...
Michael Niedermayer [Tue, 2 Dec 2014 15:32:25 +0000 (16:32 +0100)]
doc/filters: Add ascii graphics to clarify what the currently implemented tinterlace modes do

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/dashenc: make durations 64bit
Michael Niedermayer [Sat, 6 Dec 2014 16:46:02 +0000 (17:46 +0100)]
avformat/dashenc: make durations 64bit

Fix potential integer overflow
Fix CID1254944

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: Check AVFrame width/height in avcodec_encode_video2()
Michael Niedermayer [Sun, 7 Dec 2014 16:23:54 +0000 (17:23 +0100)]
avcodec/utils: Check AVFrame width/height in avcodec_encode_video2()

This is similar to the format check

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavdevice/xcbgrab: Fix show_region rectangle
Daniel Moran [Sat, 6 Dec 2014 23:48:13 +0000 (23:48 +0000)]
avdevice/xcbgrab: Fix show_region rectangle

Fixes trac ticket #4164

This is to address an error when using show_region, which would cause part of the captured area to become static.
It looks like the rectangle specifying the capture area was relative to the capture window.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/jacosubdec: check strftime return value
Clément Bœsch [Sun, 7 Dec 2014 14:46:17 +0000 (15:46 +0100)]
avcodec/jacosubdec: check strftime return value

Fixes CID1257004

5 years agolatm: Do not give a score for a single instance
Luca Barbato [Fri, 5 Dec 2014 14:31:20 +0000 (15:31 +0100)]
latm: Do not give a score for a single instance

Bug-Id: 773
CC: libav-stable@libav.org
5 years agolavfi: Increase drawtext font size limits
Михаил Муковников [Tue, 2 Dec 2014 14:09:30 +0000 (17:09 +0300)]
lavfi: Increase drawtext font size limits

Raise the maximum font size to a larger value.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoavutil/opt: Check av_parse_video_rate()s return value
Michael Niedermayer [Sun, 7 Dec 2014 01:57:39 +0000 (02:57 +0100)]
avutil/opt: Check av_parse_video_rate()s return value

Fixes CID1257008

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/opt: Check av_parse_color() return value
Michael Niedermayer [Sun, 7 Dec 2014 01:46:25 +0000 (02:46 +0100)]
avutil/opt: Check av_parse_color() return value

Fixes: CID1257007

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: check AVframe.format being set in avcodec_encode_video2()
Michael Niedermayer [Sun, 7 Dec 2014 01:10:19 +0000 (02:10 +0100)]
avcodec/utils: check AVframe.format being set in avcodec_encode_video2()

We dont fail hard if its not set as the old API allowed this and our examples
did in the distant past not set it, these examples still work with the
current code and some encoders.

Based on suggestion by: funman
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpeg: add commented out av_log() to probe
Michael Niedermayer [Sat, 6 Dec 2014 21:38:38 +0000 (22:38 +0100)]
avformat/mpeg: add commented out av_log() to probe

This is commonly needed for debugging mis-detections

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpeg: do not count PES packets inside PES packets during probing
Michael Niedermayer [Sat, 6 Dec 2014 21:33:09 +0000 (22:33 +0100)]
avformat/mpeg: do not count PES packets inside PES packets during probing

Fixes: misdetection of test2.mp3

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/buffer: add #if USE_ATOMICS around atomics specific functions to ensure sync...
Michael Niedermayer [Sat, 6 Dec 2014 19:24:27 +0000 (20:24 +0100)]
avutil/buffer: add #if USE_ATOMICS around atomics specific functions to ensure sync types arent mixed by mistake

Fixes CID1257011

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegts: Warn if ffio_ensure_seekback() failed
Michael Niedermayer [Sat, 6 Dec 2014 19:08:08 +0000 (20:08 +0100)]
avformat/mpegts: Warn if ffio_ensure_seekback() failed

Should silence CID1257005

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libxavs: disable global header code
Michael Niedermayer [Sat, 6 Dec 2014 17:55:50 +0000 (18:55 +0100)]
avcodec/libxavs: disable global header code

This code only segfaults and fixing the segfault, the resulting
files are unplayable, so disable to avoid the segfault.

Better solution is welcome

See: [FFmpeg-devel] [PATCH] avcodec/libxavs: remove global header code
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/apetag: More completely check avio_get_str() return value
Michael Niedermayer [Sat, 6 Dec 2014 16:12:49 +0000 (17:12 +0100)]
avformat/apetag: More completely check avio_get_str() return value

This is not needed but its more proper to check the return value

Fixes CID1041122

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_signalstats: fix avframe leak on error
Michael Niedermayer [Sat, 6 Dec 2014 15:57:23 +0000 (16:57 +0100)]
avfilter/vf_signalstats: fix avframe leak on error

Fixes CID1257014
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/buffersrc: add context to av_log() call
Michael Niedermayer [Sat, 6 Dec 2014 14:31:05 +0000 (15:31 +0100)]
avfilter/buffersrc: add context to av_log() call

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/hevc_ps: Add context to av_log() call
Michael Niedermayer [Sat, 6 Dec 2014 14:30:41 +0000 (15:30 +0100)]
avcodec/hevc_ps: Add context to av_log() call

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/avcodec: use NULL instead of 0 for pointer
Michael Niedermayer [Sat, 6 Dec 2014 14:29:23 +0000 (15:29 +0100)]
avfilter/avcodec: use NULL instead of 0 for pointer

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffserver_config: fix line width on fwd declarations
Reynaldo H. Verdejo Pinochet [Sat, 6 Dec 2014 05:21:56 +0000 (02:21 -0300)]
ffserver_config: fix line width on fwd declarations

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
5 years agoffserver_config: reflow _get_arg()
Reynaldo H. Verdejo Pinochet [Sat, 6 Dec 2014 05:14:20 +0000 (02:14 -0300)]
ffserver_config: reflow _get_arg()

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
5 years agoffserver_config: reflow _parse_ffconfig()
Reynaldo H. Verdejo Pinochet [Fri, 5 Dec 2014 23:38:30 +0000 (20:38 -0300)]
ffserver_config: reflow _parse_ffconfig()

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>
5 years agodoc: html: Use native viewport
Timothy Gu [Thu, 4 Dec 2014 05:31:35 +0000 (21:31 -0800)]
doc: html: Use native viewport

Fixes displaying docs on small-screen devices.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc: Do not use the headings as links to TOC anchors
Timothy Gu [Thu, 4 Dec 2014 05:31:34 +0000 (21:31 -0800)]
doc: Do not use the headings as links to TOC anchors

Instead, use FontAwesome icons (if configured to be this way) or separate
text.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/hlsenc: added segment filename option
Christian Suloway [Fri, 5 Dec 2014 21:20:15 +0000 (21:20 +0000)]
avformat/hlsenc: added segment filename option

This option allows segment filenames to be specified. Unless -hls_flags
single_file is set the filename is used as a string format with the
segment number.

Example:
ffmpeg -f lavfi -i testsrc -c:v h264 -map 0 -hls_segment_filename
bar%03d.ts foo.m3u8

Signed-off-by: Christian Suloway <csuloway@globaleagleent.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dvbsubdec: Remove redundant "DVBSub error" prefix
Michael Niedermayer [Sat, 6 Dec 2014 01:03:08 +0000 (02:03 +0100)]
avcodec/dvbsubdec: Remove redundant "DVBSub error" prefix

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '9a738c27dceb4b975784b23213a46f5cb560d1c2'
Michael Niedermayer [Sat, 6 Dec 2014 00:46:39 +0000 (01:46 +0100)]
Merge commit '9a738c27dceb4b975784b23213a46f5cb560d1c2'

* commit '9a738c27dceb4b975784b23213a46f5cb560d1c2':
  v210enc: Add SIMD optimised 8-bit and 10-bit encoders

Conflicts:
libavcodec/v210enc.c
libavcodec/v210enc.h
libavcodec/x86/Makefile
libavcodec/x86/v210enc.asm
libavcodec/x86/v210enc_init.c
tests/ref/vsynth/vsynth1-v210
tests/ref/vsynth/vsynth2-v210

See: 36091742d182b3ad4411aae22682354b3834a974
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '33c827f632f95ffe3399b695a5a0d47b366b6e20'
Michael Niedermayer [Sat, 6 Dec 2014 00:29:53 +0000 (01:29 +0100)]
Merge commit '33c827f632f95ffe3399b695a5a0d47b366b6e20'

* commit '33c827f632f95ffe3399b695a5a0d47b366b6e20':
  swscale: Properly scale YUV

Conflicts:
libswscale/swscale_unscaled.c
tests/ref/fate/filter-pixdesc-yuv420p10be
tests/ref/fate/filter-pixdesc-yuv420p10le
tests/ref/fate/filter-pixdesc-yuv420p9be
tests/ref/fate/filter-pixdesc-yuv420p9le
tests/ref/fate/filter-pixdesc-yuva420p10be
tests/ref/fate/filter-pixdesc-yuva420p10le
tests/ref/fate/filter-pixdesc-yuva420p9be
tests/ref/fate/filter-pixdesc-yuva420p9le
tests/ref/fate/filter-pixfmts-copy
tests/ref/fate/filter-pixfmts-null
tests/ref/fate/filter-pixfmts-scale
tests/ref/fate/filter-pixfmts-vflip

See: abe0b8e9f378a0f8781c1a3da6714d20cfd19594
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '8c0a865ad96b9e8542051f75b0edc424cb73994e'
Michael Niedermayer [Sat, 6 Dec 2014 00:01:06 +0000 (01:01 +0100)]
Merge commit '8c0a865ad96b9e8542051f75b0edc424cb73994e'

* commit '8c0a865ad96b9e8542051f75b0edc424cb73994e':
  mov: skip version and flags attributes in mov_read_chan()

See: 59d40fc7e66e6ebb2d89e25115492bfe13b07d95
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc/options: fix leaks in avcodec_copy_context
Lukasz Marek [Wed, 26 Nov 2014 23:41:16 +0000 (00:41 +0100)]
lavc/options: fix leaks in avcodec_copy_context

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoMerge commit 'b72727a5248f1ef02db99b378dce1eb48a46357a'
Michael Niedermayer [Fri, 5 Dec 2014 23:51:10 +0000 (00:51 +0100)]
Merge commit 'b72727a5248f1ef02db99b378dce1eb48a46357a'

* commit 'b72727a5248f1ef02db99b378dce1eb48a46357a':
  lavc: mention that the parser callback never returns an error

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rmdec: Check for overflow in ff_rm_read_mdpr_codecdata()
Michael Niedermayer [Fri, 5 Dec 2014 23:18:29 +0000 (00:18 +0100)]
avformat/rmdec: Check for overflow in ff_rm_read_mdpr_codecdata()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rmdec: rm_read_extradata: add error message for oversized extradata
Michael Niedermayer [Fri, 5 Dec 2014 23:17:30 +0000 (00:17 +0100)]
avformat/rmdec: rm_read_extradata: add error message for oversized extradata

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1c77ead1fb14d64e6798fc5e32af04abcb3cebb4'
Michael Niedermayer [Fri, 5 Dec 2014 23:41:00 +0000 (00:41 +0100)]
Merge commit '1c77ead1fb14d64e6798fc5e32af04abcb3cebb4'

* commit '1c77ead1fb14d64e6798fc5e32af04abcb3cebb4':
  rm: Use the correct codec_data_size signedness

Conflicts:
libavformat/rm.h
libavformat/rmdec.c

See: a6f730730b82645a9d31aad0968487cb77d6946c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '1eec9bfc383f6dca29d83a2bfb45433dd66561c9'
Michael Niedermayer [Fri, 5 Dec 2014 22:49:56 +0000 (23:49 +0100)]
Merge commit '1eec9bfc383f6dca29d83a2bfb45433dd66561c9'

* commit '1eec9bfc383f6dca29d83a2bfb45433dd66561c9':
  APIchanges: mark the release 11 branch point

Conflicts:
doc/APIchanges

Not merged as the contents in our APIchanges differ and it could be confusing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc/options: don't copy priv context when it is not AVOption object
Lukasz Marek [Tue, 2 Dec 2014 22:24:15 +0000 (23:24 +0100)]
lavc/options: don't copy priv context when it is not AVOption object

This prevents potential crash when opt API is used without a class.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoMerge commit '69c1fe7c9c9bc85eebfc02c6a19caf7e88cd74ff'
Michael Niedermayer [Fri, 5 Dec 2014 22:23:25 +0000 (23:23 +0100)]
Merge commit '69c1fe7c9c9bc85eebfc02c6a19caf7e88cd74ff'

* commit '69c1fe7c9c9bc85eebfc02c6a19caf7e88cd74ff':
  mkv: Validate ASS Start and End fields

Conflicts:
libavformat/matroskaenc.c

No change as the changed code is not in FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7834a54c66d46471b246b411627efe2e8ef9dd47'
Michael Niedermayer [Fri, 5 Dec 2014 22:20:01 +0000 (23:20 +0100)]
Merge commit '7834a54c66d46471b246b411627efe2e8ef9dd47'

* commit '7834a54c66d46471b246b411627efe2e8ef9dd47':
  configure: enable vda hwaccel by default

Conflicts:
configure

See: 942cded690bc6dc931c60078f39cf0f339a89058
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '894545cb717427a47f800dc7738b923afde139a6'
Michael Niedermayer [Fri, 5 Dec 2014 22:07:47 +0000 (23:07 +0100)]
Merge commit '894545cb717427a47f800dc7738b923afde139a6'

* commit '894545cb717427a47f800dc7738b923afde139a6':
  mpegvideo: exit cleanly when ff_mpv_common_frame_size_change() fails

See: cfce6f7efd28130bf0dd409b2367ca0f8c9b2417
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '7a38987f245e3c280d81442f207b983333b6233c'
Michael Niedermayer [Fri, 5 Dec 2014 22:06:36 +0000 (23:06 +0100)]
Merge commit '7a38987f245e3c280d81442f207b983333b6233c'

* commit '7a38987f245e3c280d81442f207b983333b6233c':
  mpegvideo: free_context_frame() cannot fail, make it return void

See: 94c61cd9aede4c0b57632d524a725c2dda719eb3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'c45eeb2dbf42382d335da8068231a8026c08843b'
Michael Niedermayer [Fri, 5 Dec 2014 21:46:46 +0000 (22:46 +0100)]
Merge commit 'c45eeb2dbf42382d335da8068231a8026c08843b'

* commit 'c45eeb2dbf42382d335da8068231a8026c08843b':
  mpegvideo: replace assert about interlaced EC with debug av_log()

Conflicts:
libavcodec/mpegvideo.c

See: c88bbc01eb7f67f7399fb89800bf1bfc89edb248
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '3a56bcee7cb7549b2813e39ce3bee3b7c522aecb'
Michael Niedermayer [Fri, 5 Dec 2014 21:19:55 +0000 (22:19 +0100)]
Merge commit '3a56bcee7cb7549b2813e39ce3bee3b7c522aecb'

* commit '3a56bcee7cb7549b2813e39ce3bee3b7c522aecb':
  mpeg12dec: Use more specific error codes

Conflicts:
libavcodec/mpeg12dec.c

See: 1852b2a0f497d3c5437d5b50379d7874fc8c285a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b56afb48aecb96e03347f5b569f16a64147c18b1'
Michael Niedermayer [Fri, 5 Dec 2014 21:07:21 +0000 (22:07 +0100)]
Merge commit 'b56afb48aecb96e03347f5b569f16a64147c18b1'

* commit 'b56afb48aecb96e03347f5b569f16a64147c18b1':
  mpeg12dec: Print error/warning messages on issues in mpeg1_decode_sequence()

Conflicts:
libavcodec/mpeg12dec.c

See: 88b4c1a7316cf47f68bf04accf613375b7326992
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e0bb74a1403ed77ef369b9d62866f8a4afaf3f1d'
Michael Niedermayer [Fri, 5 Dec 2014 20:55:44 +0000 (21:55 +0100)]
Merge commit 'e0bb74a1403ed77ef369b9d62866f8a4afaf3f1d'

* commit 'e0bb74a1403ed77ef369b9d62866f8a4afaf3f1d':
  exr: Add a gamma flag to exr loader to avoid banding

Conflicts:
libavcodec/exr.c

See: cd3daad77ea420f3373d3c5feee46825d235cccc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd69d787dad77f62c89cbc7ea5d301641f45f36e3'
Michael Niedermayer [Fri, 5 Dec 2014 20:41:53 +0000 (21:41 +0100)]
Merge commit 'd69d787dad77f62c89cbc7ea5d301641f45f36e3'

* commit 'd69d787dad77f62c89cbc7ea5d301641f45f36e3':
  h264: proper cleanup in ff_h264_alloc_tables() if DPB alloc fails

See: 949057c95879e601bd33c8a42eeca39ced2b9a2d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '56de2897a68e3a8795b0b3c593dad1c5832696e0'
Michael Niedermayer [Fri, 5 Dec 2014 20:39:41 +0000 (21:39 +0100)]
Merge commit '56de2897a68e3a8795b0b3c593dad1c5832696e0'

* commit '56de2897a68e3a8795b0b3c593dad1c5832696e0':
  h264: Fix memory leak on ff_h264_decode_init() failure

Conflicts:
libavcodec/h264.c

See: 309a931a38b42c0a635f096cdbea9c21c5e54eab
Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/dvbsubdec: Pass context to av_log()
Michael Niedermayer [Fri, 5 Dec 2014 19:30:03 +0000 (20:30 +0100)]
avcodec/dvbsubdec: Pass context to av_log()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/golomb: use NULL for pointers instead of 0
Michael Niedermayer [Fri, 5 Dec 2014 19:27:04 +0000 (20:27 +0100)]
avcodec/golomb: use NULL for pointers instead of 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/examples/filtering_video: fix frame rate
Piotr Fusik [Fri, 5 Dec 2014 14:47:05 +0000 (15:47 +0100)]
doc/examples/filtering_video: fix frame rate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/mpegts: fix Opus stream count
Rafaël Carré [Fri, 5 Dec 2014 13:33:58 +0000 (14:33 +0100)]
avformat/mpegts: fix Opus stream count

That number represents the number of streams, not the number of channels

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agov210enc: Add SIMD optimised 8-bit and 10-bit encoders
Kieran Kunhya [Tue, 2 Dec 2014 17:08:25 +0000 (17:08 +0000)]
v210enc: Add SIMD optimised 8-bit and 10-bit encoders

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agoswscale: Properly scale YUV
Derek Buitenhuis [Tue, 2 Dec 2014 17:08:24 +0000 (17:08 +0000)]
swscale: Properly scale YUV

Only shift limited range luma, and always only shift chroma
for upconversion.

Based off a patch by Michael Niedermayer.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agomov: skip version and flags attributes in mov_read_chan()
Matthieu Bouron [Thu, 4 Dec 2014 19:13:39 +0000 (19:13 +0000)]
mov: skip version and flags attributes in mov_read_chan()

Fixes decting channel layout for files with uncommon audio, such as
FL and FR in two separate streams. Introduced in 3bab7cd.

CC: libav-devel@libav.org
Sample-Id: ticket1474.mov
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
5 years agoavcodec/mpegaudiodec_template: only allocate fdsp when its used
Michael Niedermayer [Fri, 5 Dec 2014 03:27:49 +0000 (04:27 +0100)]
avcodec/mpegaudiodec_template: only allocate fdsp when its used

Fixes memleak

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc/libxvid: workaround for bug in libxvidcore
Lukasz Marek [Mon, 24 Nov 2014 00:12:06 +0000 (01:12 +0100)]
lavc/libxvid: workaround for bug in libxvidcore

libxvidcore calculate number of threads basing on video height.
If height is small enough it allocates 0 bytes long memory and
writes to it.
Setting thread_count to 0 uses 1 thread and skips bugged code.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavc: mention that the parser callback never returns an error
Vittorio Giovara [Thu, 4 Dec 2014 20:46:16 +0000 (20:46 +0000)]
lavc: mention that the parser callback never returns an error

5 years agolibavformat/mxfdec.c refactor resolving MultiDescriptor and remove essence group...
Mark Reid [Wed, 3 Dec 2014 00:43:52 +0000 (16:43 -0800)]
libavformat/mxfdec.c refactor resolving MultiDescriptor and remove essence group hack

I think this is a better way to deal with single frame essence data then my
previous way.

Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoreplaced av_dv_codec_profile by av_dv_codec_profile2 in encoder and dv muxers
Steve Jiekak [Thu, 4 Dec 2014 13:48:15 +0000 (14:48 +0100)]
replaced av_dv_codec_profile by av_dv_codec_profile2 in encoder and dv muxers

Signed-off-by: Steve Jiekak <devaureshy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoadd av_dv_codec_profile2 : uses framerate to select best matching profile. default...
Steve Jiekak [Thu, 4 Dec 2014 13:48:14 +0000 (14:48 +0100)]
add av_dv_codec_profile2 : uses framerate to select best matching profile. default on first matching profile

Signed-off-by: Steve Jiekak <devaureshy@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/examples/transcoding: check encoder before using it
Michael Niedermayer [Thu, 4 Dec 2014 17:58:38 +0000 (18:58 +0100)]
doc/examples/transcoding: check encoder before using it

Fixes null pointer exception

Found-by: stoupeace
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/imc: only check remaining bits in case bits will be read
Michael Niedermayer [Thu, 4 Dec 2014 17:17:17 +0000 (18:17 +0100)]
avcodec/imc: only check remaining bits in case bits will be read

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoimc: make issue non-fatal
Christophe Gisquet [Wed, 3 Dec 2014 23:04:50 +0000 (00:04 +0100)]
imc: make issue non-fatal

The "faulty" samples actually sound fine when ignoring this issue.

For ticket #3886, more samples are decoded.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pngdec: use memcpy instead of byte loops for P frames.
Benoit Fouet [Wed, 3 Dec 2014 13:31:28 +0000 (14:31 +0100)]
avcodec/pngdec: use memcpy instead of byte loops for P frames.

Rely on the way memcpy is optimized for one's system instead of looping
on a byte buffer for buffer copies to handle P frames.

Tested-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMAINTAINERS: add 2.5
Michael Niedermayer [Thu, 4 Dec 2014 13:24:59 +0000 (14:24 +0100)]
MAINTAINERS: add 2.5

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agorm: Use the correct codec_data_size signedness
Luca Barbato [Thu, 4 Dec 2014 11:00:01 +0000 (12:00 +0100)]
rm: Use the correct codec_data_size signedness

The function takes a size and not an offset.

CC: libav-stable@libav.org
Sample-Id: rm_deadlock.rm

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
5 years agoavcodec/ppc/vp8dsp_altivec.c: POWER LE support put_vp8_epel_h_altivec_core() put_vp8_...
Rong Yan [Thu, 4 Dec 2014 10:34:02 +0000 (10:34 +0000)]
avcodec/ppc/vp8dsp_altivec.c: POWER LE support put_vp8_epel_h_altivec_core() put_vp8_epel_v_altivec_core() put_vp8_pixels16_altivec() add marcos GET_PIXHL() GET_OUTER() LOAD_HL()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ppc/vc1dsp_altivec: add POWER LE support to vc1_inv_trans_8x4_altivec()
Rong Yan [Thu, 4 Dec 2014 05:51:30 +0000 (05:51 +0000)]
avcodec/ppc/vc1dsp_altivec: add POWER LE support to vc1_inv_trans_8x4_altivec()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRELEASE: Bump
Timothy Gu [Thu, 4 Dec 2014 04:15:20 +0000 (20:15 -0800)]
RELEASE: Bump

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/aacdec: reduce noisiness of missing channel elements
Michael Niedermayer [Thu, 4 Dec 2014 00:47:55 +0000 (01:47 +0100)]
avcodec/aacdec: reduce noisiness of missing channel elements

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Thu, 4 Dec 2014 00:47:46 +0000 (01:47 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Fix standalone compilation of the iec61883 input device.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoFix standalone compilation of the iec61883 input device.
Carl Eugen Hoyos [Thu, 4 Dec 2014 00:35:47 +0000 (01:35 +0100)]
Fix standalone compilation of the iec61883 input device.

5 years agodoc/APIchanges: add 2.5 cut marker
Michael Niedermayer [Thu, 4 Dec 2014 00:28:40 +0000 (01:28 +0100)]
doc/APIchanges: add 2.5 cut marker

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoChangelog: add 2.5 entry n2.6-dev
Michael Niedermayer [Thu, 4 Dec 2014 00:28:06 +0000 (01:28 +0100)]
Changelog: add 2.5 entry

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pngdec: fix indentation in handle_row()
Benoit Fouet [Wed, 3 Dec 2014 13:16:57 +0000 (14:16 +0100)]
avcodec/pngdec: fix indentation in handle_row()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pngdec: fix mem leak in init()
Benoit Fouet [Wed, 3 Dec 2014 13:16:56 +0000 (14:16 +0100)]
avcodec/pngdec: fix mem leak in init()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolibavcodec/pngdec: support 'previous' dispose operation for APNG.
Benoit Fouet [Wed, 3 Dec 2014 13:16:55 +0000 (14:16 +0100)]
libavcodec/pngdec: support 'previous' dispose operation for APNG.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264_i386: Fix operand size
Reimar Döffinger [Wed, 3 Dec 2014 21:39:00 +0000 (22:39 +0100)]
h264_i386: Fix operand size

Fixes fate failure on macosx clang x86-64

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoRELEASE_NOTES: update for 2.5
Michael Niedermayer [Wed, 3 Dec 2014 20:55:34 +0000 (21:55 +0100)]
RELEASE_NOTES: update for 2.5

If you spot something missing wrong or improvable, do not hesitate
to push fixes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/APIchanges: fill in hashes and dates
Michael Niedermayer [Wed, 3 Dec 2014 20:51:28 +0000 (21:51 +0100)]
doc/APIchanges: fill in hashes and dates

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoChangelog: Add libpostproc visualization
Michael Niedermayer [Wed, 3 Dec 2014 20:42:03 +0000 (21:42 +0100)]
Changelog: Add libpostproc visualization

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/oggenc: use meaningful error codes
Lukasz Marek [Tue, 2 Dec 2014 23:35:51 +0000 (00:35 +0100)]
lavf/oggenc: use meaningful error codes

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
5 years agoswscale/x86/rgb2rgb_template: fix crash with tiny size and nv12 output
Michael Niedermayer [Wed, 3 Dec 2014 19:21:56 +0000 (20:21 +0100)]
swscale/x86/rgb2rgb_template: fix crash with tiny size and nv12 output

Fixes Ticket4151

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/rmdec: Check codec_data_size
Michael Niedermayer [Wed, 3 Dec 2014 19:01:18 +0000 (20:01 +0100)]
avformat/rmdec: Check codec_data_size

Fixes infinite loop
Fixes Ticket4154

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/aviobuf: Fix infinite loop in ff_get_line()
Michael Niedermayer [Wed, 3 Dec 2014 18:05:56 +0000 (19:05 +0100)]
avformat/aviobuf: Fix infinite loop in ff_get_line()

Fixes ticket4152

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavdevice/decklink_common: fix COM initialization failure check
Jonathan Baecker [Wed, 3 Dec 2014 15:41:41 +0000 (16:41 +0100)]
avdevice/decklink_common: fix COM initialization failure check

Signed-off-by: Jonathan Baecker <jonbae77@gmail.com>
Reviewed-by: Ramiro Polla <ramiro.polla@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAPIchanges: mark the release 11 branch point
wm4 [Wed, 3 Dec 2014 14:01:49 +0000 (15:01 +0100)]
APIchanges: mark the release 11 branch point

5 years agoavcodec/atrac3plusdec: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Wed, 3 Dec 2014 13:46:33 +0000 (14:46 +0100)]
avcodec/atrac3plusdec: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mpegaudiodec_float: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Wed, 3 Dec 2014 13:43:40 +0000 (14:43 +0100)]
avcodec/mpegaudiodec_float: Use avpriv_float_dsp_alloc()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/opusdec: Use avpriv_float_dsp_alloc()
Michael Niedermayer [Wed, 3 Dec 2014 13:39:43 +0000 (14:39 +0100)]
avcodec/opusdec: Use avpriv_float_dsp_alloc()

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