ffmdec: limit the backward seek to the last resync position

If resyncing leads to the same position as previously, it will again
lead to a resync attempt, resulting in an infinite loop.

Thus don't seek back beyond the last syncpoint.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Add dependencies to configure file for vf_fftfilt

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

ffmdec: make sure the time base is valid

A negative time base can trigger assertions.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '46d4d8575979a24a8d026d9805039b724e0e3e5f'

* commit '46d4d8575979a24a8d026d9805039b724e0e3e5f':
  movenc: Avoid writing separate flags for the first sample if not necessary

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

Merge commit '00d751d4fc20ec88d2cc2c9f39ec8b9e9c8cdeba'

* commit '00d751d4fc20ec88d2cc2c9f39ec8b9e9c8cdeba':
  movenc: Set tfhd default sample flags based on actual samples, if possible

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

doc: Clarify documentation for fade duration.

doc: Improve video creation examples (from image2).

The examples used to drop frames in most cases which
was probably not what users expected.

Fix the intra_dc_precision API doc.

The mpegvideo decoder has set intra_dc_precision since forever.

lavc/ffv1enc: Auto-select -coder 1 for >8bit also for yuv.

Reported-by: Christoph Gerstbauer

movenc: Avoid writing separate flags for the first sample if not necessary

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

movenc: Set tfhd default sample flags based on actual samples, if possible

This avoids assuming that e.g. audio samples are marked as
sync samples.

This allows omitting the sample flags from trun, if the default
flags happen to be right for all the samples.

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

ffmdec: fix infinite loop at EOF

If EOF is reached, while skipping bytes, avio_tell(pb) won't change
anymore, resulting in an infinite loop.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ffmdec: initialize f_cprv, f_stvi and f_stau

They are used in a switch statement, but it is not guaranteed that the
COMM case (where they are set to 0) is reached before the other cases.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '0ce3a0f9d9523a9bcad4c6d451ca5bbd7a4f420d'

* commit '0ce3a0f9d9523a9bcad4c6d451ca5bbd7a4f420d':
  utvideodec: Handle slice_height being zero

See: 3881606240953b9275a247a1c98a567f3c44890f
Merged-by: Michael Niedermayer <michaelni@gmx.at>

utvideodec: Handle slice_height being zero

Fixes out of array accesses.

CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Bug-Id: CVE-2014-9604
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Merge commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f'

* commit '7b9cb7b36543c2a0e46d99b0e41824b9e7dd0c8f':
  avprobe: Export coded_{width,height} in -show_streams

Conflicts:
avprobe.c

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

avcodec/tiff: move bpp check to after "end:"

This ensures that all current and future code-pathes get bpp checked

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

Merge commit 'ae5e1f3d663a8c9a532d89e588cbc61f171c9186'

* commit 'ae5e1f3d663a8c9a532d89e588cbc61f171c9186':
  tiff: Check that there is no aliasing in pixel format selection

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

RELEASE: update to 2.6.git

Signed-off-by: James Almer <jamrial@gmail.com>

ffserver: remove stale debug stanza

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

ffserver: move assignment outside condition eval

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

ffserver: break some too long lines

Signed-off-by: Reynaldo H. Verdejo Pinochet <reynaldo@osg.samsung.com>

doc: avoid the incorrect phrase 'allow to'

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avprobe: Export coded_{width,height} in -show_streams

avfilter/vf_edgedetect: Change enums to int, which are accessed via AVOption as int

This fixes depending on implementation defined behavior

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

avfilter/vf_curves: Change enums to int, which are accessed via AVOption as int

This fixes depending on implementation defined behavior

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

avfilter/vf_drawtext: Change enums to int, which are accessed via AVOption as int

This fixes depending on implementation defined behavior

fate: add test for vp90-2-trac4359.webm

Regression test for the bug from trac ticket #4359 fixed in commit efff3854

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

Merge commit '6448f15af02f2c3cf0df8cb8237957e426041f2d'

* commit '6448f15af02f2c3cf0df8cb8237957e426041f2d':
  mxfdec: Fix the error handling for when strftime fails

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

Merge commit '5f5b78aca35d07c771f5c4c73a984be9fe04a0b8'

* commit '5f5b78aca35d07c771f5c4c73a984be9fe04a0b8':
  xcbgrab: Free the host string after checking the connection

Conflicts:
libavdevice/xcbgrab.c

No change as the bug was not in FFmpeg

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

Merge commit '0025f7408a0fab2cab4a950064e4784a67463994'

* commit '0025f7408a0fab2cab4a950064e4784a67463994':
  vorbis: Check the vlc value in setup_classifs

Conflicts:
libavcodec/vorbisdec.c

See: ae038c0914460646503be083e30e3971093239a1
See: 709cae2bcbc0ea2c5d46c932b3d8301cf8f98e6b
Merged-by: Michael Niedermayer <michaelni@gmx.at>

tiff: Check that there is no aliasing in pixel format selection

Fixes possible issues with unexpected bpp/bppcount values.

CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Bug-Id: CVE-2014-8544
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Merge commit '62de77ffcaebd42fe685b8426da56b89b2532318'

* commit '62de77ffcaebd42fe685b8426da56b89b2532318':
  vorbis: Use a local codebook variable

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

mxfdec: Fix the error handling for when strftime fails

The str variable is a char ** here.

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

doc/filters: Add some random examples for fftfilt

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

vp9: included uses_2pass member in vp9_ref_frame().

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

xcbgrab: Free the host string after checking the connection

Prevent an use after free in the error message.

Bug-Id: CID 1274040
CC: libav-stable@libav.org

vorbis: Check the vlc value in setup_classifs

The valid returned values are always at most 11bit.
Remove the previous check that assumed larger values plausible and
use a signed integer to check get_vlc2 return values.

CC: libav-stable@libav.org

vorbis: Use a local codebook variable

Makes the code a little simpler.

vp9: split segmentation map / mvpair references.

This prevents a memcpy if segmentation.update_map == false.

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

avfilter/af_astats: redo zero channel handling

Suggested-by: Nicolas George
Signed-off-by: Paul B Mahol <onemda@gmail.com>

Merge commit '0f9f7969ef4df3661131cede3e8cc770e1ea3db8'

* commit '0f9f7969ef4df3661131cede3e8cc770e1ea3db8':
  rmdec: Improve message for demux error

See: 3880b4541ace2697f380ae1f43cb2299efeb2cc7
Merged-by: Michael Niedermayer <michaelni@gmx.at>

avfilter/af_astats: Avoid Zero division in print part.

rmdec: Improve message for demux error

Use correct context, reduce log level, don't assume it is a video stream,
and print the tag of the unknown stream.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

avcodec/vc1_mc: optimize get_chroma_mv, and add get_luma_mv

Test results:

before:
  fate-suite/vc1/SA10091.vc1: 1062 decicycles in ff_vc1_mc_4mv_chroma's get mv, 4089 runs, 7 skips
  fate-suite/vc1/SA10143.vc1: 1112 decicycles in ff_vc1_mc_4mv_luma's get mv, 4096 runs, 0 skips
  fate-suite/vc1/SA20021.vc1: 991 decicycles in ff_vc1_mc_4mv_chroma get mv, 8192 runs, 0 skips

after:
  fate-suite/vc1/SA10091.vc1: 940 decicycles in ff_vc1_mc_4mv_chroma's get mv, 4096 runs, 0 skips
  fate-suite/vc1/SA10143.vc1: 786 decicycles in ff_vc1_mc_4mv_luma's get mv, 4096 runs, 0 skips
  fate-suite/vc1/SA20021.vc1: 876 decicycles in ff_vc1_mc_4mv_chroma get mv, 8189 runs, 3 skips

Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/mpegvideo_motion: Fix off by 1 error in MV bounds checking in qpel, chroma_4mv and 8x8

No testcase available

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

avcodec/mpegvideo_motion: Fix off by 1 error in MV bounds checking

Fixes Ticket4299

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

avcodec/opusdec: Fix delayed sample value

Fixes out of array access
Fixes: ffmpeg_opus_crash1.ogg

This solution is likely not optimal in terms of error concealment but
its simple and fixes the out of array access.

Found-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Tested-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/opusdec: Clear out pointers per packet

This is safer than to assume that all error pathes cleared them and
nothing will use uncleared pointers.

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

avcodec/utils: Align YUV411 by as much as the other YUV variants

Fixes out of array accesses
Fixes: ffmpeg_mjpeg_crash2.avi

Found-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Tested-by: Thomas Lindroth <thomas.lindroth@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/vc1_mc: change the type of s_rndtblfield to uint8_t

Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/vc1_mc: Simplify v_edge_pos and src_y correction when fieldmv is true

Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/golomb: cleanup

Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

ChangeLog: Remove the redundant VP9 RTP entry

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

Merge commit 'b77e335e441040a40fc6156b8e4a134745d10233'

* commit 'b77e335e441040a40fc6156b8e4a134745d10233':
  configure: Move the .object_arch check to the right place

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

Merge commit 'dcae2e32f7d8a1ca5fb8c1e4aa81313be854dd73'

* commit 'dcae2e32f7d8a1ca5fb8c1e4aa81313be854dd73':
  arm: Suppress tags about used cpu arch and extensions

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

configure: Move the .object_arch check to the right place

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

avcodec/vc1_mc: remove useless variables

Signed-off-by: Zeng Zhaoxiu <zhaoxiu.zeng@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

arm: Suppress tags about used cpu arch and extensions

When all the codepaths using manually set .arch/.fpu code is
behind runtime detection, the elf attributes should be suppressed.

This allows tools to know that the final built binary doesn't
strictly require these extensions.

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

avfilter: Add FFT domain filter.

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

mips/asmdefs: change include guard to read AVUTIL_ instead of AVCODEC_

Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Revert "avutil/opencl: is_compiled flag not being cleared in av_opencl_uninit"

Fixed build with opencl enabled
Found-by: WJ Liu
This reverts commit 0f2359b86926ed33da4bd64ca76d84d03d5ad380.

vp9: fix segmentation map retention with threading enabled.

Fixes ticket 4359.

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

avfilter/vf_colormatrix: Change enums to int, which are accessed via AVOption as int

This fixes depending on implementation defined behavior

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

avfilter/f_perms: Change enums to int, which are accessed via AVOption as int

This fixes depending on implementation defined behavior

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

avfilter/avf_showwaves: Change enums to int, which are accessed via AVOption as int

This fixes depending on implementation defined behavior

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

Merge commit 'cecf45b2bfbb85e9e59f355428fbd4d8cbc652a8'

* commit 'cecf45b2bfbb85e9e59f355428fbd4d8cbc652a8':
  doc: Add -list_formats all example for video4linux2

Conflicts:
doc/indevs.texi

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

doc: Add -list_formats all example for video4linux2

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

configure: Make compilable with VS2015 (missing hunk)

This hunk was missing in the github pull request when i downloaded it,
but is needed

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

configure: Make compilable with VS2015

So Visual Studio 2015 has some breaking changes regarding the C
runtime. In short, they made C99 compatable runtime.
Refer to http://blogs.msdn.com/b/vcblog/archive/2014/06/18/crt-features-fixes-and-breaking-changes-in-visual-studio-14-ctp1.aspx

Made-Seriously-Happy: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

fix spelling errors

 opttimizations -> optimizations
 grabing        -> grabbing
 many resource  -> many resources
 isnt           -> isn't
 silcense       -> silence

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '9731cf4001377fa2f75c279072cc2b0cbd57bf8e'

* commit '9731cf4001377fa2f75c279072cc2b0cbd57bf8e':
  movenc: Keep writing zero-entry stts atoms as intended

Conflicts:
libavformat/movenc.c

See: 95165f7c1b533c121b890fa1e82e8ed596cfc108
Merged-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/samidec: make sure to properly restore parsing context after a tag

Changelog: Add back "version next"

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

Add 2.6 to maintained releases

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

doc/APIchanges: Fill in the xx

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

doc/APIchanges: Add 2.6 cut marker

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

Changelog: rename next to 2.6

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

avutil/opencl: is_compiled flag not being cleared in av_opencl_uninit

When OpenCL kernels are compiled, is_compiled flag is being set for each
kernel. But, in opencl uninit, this flag is not being cleared.
This causes an error when an OpenCL kernel is tried on different OpenCL
devices on same platform.

Here is the patch with a fix

Reviewed-by; Wei Gao <highgod0401@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

movenc: Keep writing zero-entry stts atoms as intended

a876585215 had the unintended side effect of returning AVERROR(ENOMEM)
when track->entry is zero, while the code intentionally wants to
continue in that case.

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

changelog: add mips 64-bit port

Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

mips: port optimizations to mips n64

This mainly consists of replacing all the pointer arithmatic 'addiu'
instructions with PTR_ADDIU which will handle the differences in pointer
sizes when compiled on 64 bit mips systems.

The header asmdefs.h contains the PTR_ macros which expend to the correct mips
instructions to manipulate registers containing pointers.

Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

configure, mips: remove MIPS32R2, merging it with MIPSFPU

There are no independant uses of mips32r2 instructions except for the
FPU parts. Due to the heavy use of mips32r2 specifc fpu extensions, I
am guessing the original author intended MIPSFPU to imply MIPS32R2 anyway.

Since these fpu instructions are available on mips64 (non-r2), enable them
there as well.

Also remove the last occurence of HAVE_MIPS32R2 (which is coupled to
HAVE_MIPSFPU anyway).

mips32r2 is left in the list of options form compatability so that using
--disable-mips32r2 doesn't break anything.

Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

mips/aacdec: remove uses of mips32r2 specific ext instructions

Removing these removes the dependency of this code on mips32r2 which would
allow it to be used on processors which have FPU instructions, but not r2
instructions (like the mips64el debian port for instance).

Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

AAC: Add support for 7350Hz sampling rates, no error on too hight bitrate.

Instead, warn that bitrate will be clamped down to the maximum allowed.

Patch is mostly work of Kamendo2 in issue #2686, quite tested within that issue.

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

Merge commit '5aef535a64350b7bc06c5bdda8c26c9efec9443b'

* commit '5aef535a64350b7bc06c5bdda8c26c9efec9443b':
  dashenc: Update extradata for mov muxer

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

Merge commit '6cf7f30655e95e27fd0394b5a80970d6f9517015'

* commit '6cf7f30655e95e27fd0394b5a80970d6f9517015':
  dashenc: Simplify code by using a local variable

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

Merge commit '25c29d32835f38cdc5f0c84fa27dfc489a228770'

* commit '25c29d32835f38cdc5f0c84fa27dfc489a228770':
  libopenh264enc: Add support for building with OpenH264 1.4

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

MAINTAINERS: Remove 1.2 from the maintained releases

The only distribution which still uses it according to
https://trac.ffmpeg.org/wiki/Downstreams is "gentoo stable", but
http://packages.gentoo.org/package/media-video/ffmpeg lists stable as shipping 1.2.6 which is 6 point
releases behind. Also gentoos ffmpeg maintainer stated "don't worry about gentoo: we're in the process
of moving to latest 2.2 for stable."

CC: Alexis Ballier <aballier@gentoo.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

dashenc: Update extradata for mov muxer

The mov muxer already supports picking up extradata that wasn't
present during the avformat_write_header call - we just need to
propagate it. Since the dash muxer uses delay_moov, we have time
up until the first segment is written to get extradata filled in.

Also update the codec description string when the extradata becomes
available.

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

dashenc: Simplify code by using a local variable

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

libopenh264enc: Add support for building with OpenH264 1.4

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

webp: ensure that each transform is only used once

According to the WebP Lossless Bitstream Specification
"each transform is allowed to be used only once".

If a transform is more than once this can lead to memory
corruption.

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

Merge commit '88b160a457e491cb9e014630ef5387ad3500258e'

* commit '88b160a457e491cb9e014630ef5387ad3500258e':
  avfilter: Return more meaningful error codes

Conflicts:
libavfilter/avfilter.c

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

lavd/avfoundation: Add support for 24 and 32bit integer input.

Tested on Mac Mini soundflower and built-in line input.

Reviewed-by: Thilo Borgmann

lavd/avfoundation: Add support for 16bit integer input.

Reviewed-by: Thilo Borgmann

hls: detect SAMPLE-AES encryption

SAMPLE-AES encryption is not commonly used yet, but without this patch
ffmpeg is thinking that the hls segments are not encrypted which
produces broken files.

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

Drop outdated RELEASE_NOTES

A new RELEASE_NOTES specific to the release will be added.

Merge commit 'ad786dd450f26ecfbd35bb26e8b149664ecde049'

* commit 'ad786dd450f26ecfbd35bb26e8b149664ecde049':
  h264: remove a now redundant error check

Conflicts:
libavcodec/h264_slice.c

See: 64591f8f86f2dfeac13ee6b4e971d069675ca814
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'c73c3c34fe72bb06966450207917ce902146b172'

* commit 'c73c3c34fe72bb06966450207917ce902146b172':
  avformat/adxdec: set avctx->channels in adx_read_header

See: 7faa40af982960608b117e20fec999b48011e5e0
See: 64ea4a0598e7ca61b95cf6c93fd409151a448001
Merged-by: Michael Niedermayer <michaelni@gmx.at>