* commit 'df33a58e':
  lavf: avoid integer overflow when estimating bitrate
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'fab694dd':
  lavf: move a variable declaration to the block where it's used

Conflicts:
	libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'fe9bb61f':
  pictordec: pass correct context to avpriv_request_sample

Conflicts:
	libavcodec/pictordec.c

No change as the avpriv_request_sample() has already been replaced by an implementation
of the codepath.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5f7aecde':
  pictordec: break out of both decoding loops when y drops below 0

Conflicts:
	libavcodec/pictordec.c

The added check is redundant.
It shows the error path more clearly though

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

avcodec/vcr1: replace redundant checks from libav (8aba7968)  by asserts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8aba7968':
  vcr1: add sanity checks

Conflicts:
	libavcodec/vcr1.c

See: 845724c8
See: 8e09482eMerged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes Ticket2896

An alternative to this would be to change the code to support any
stride.
The condition of differing strides should be rare.
If theres no speedloss supporting any stride would be better
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Noticed-by: James Almer
Signed-off-by: Paul B Mahol <onemda@gmail.com>

Regression since 14d50c19.
Fixes #2932.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

Fixing av_packet_copy_side_data to work correctly when source and
destination are the same. This makes sure that there is no memory
leak and double frees.

Signed-off by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Fixes invalid reads.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Otherwise picmemset can get called with negative y, resulting in an
invalid write.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Fixes invalid reads with corrupted files.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org

Fixes Ticket2892
Reveiwed-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes fate-lavf-pam on alpha
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Fixes ticket #2925.

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

Based on a patch by Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>.
http://lists.ffmpeg.org/pipermail/ffmpeg-devel/2012-December/136677.html

The original patch was rebased by Tudor SUCIU <tudor.suciu@gmail.com>.

Lots of additional features and fixes are made by me.

Fixes ticket #2086.

Changes since last version:
- change default page to all pages
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* cehoyos/master:
  Read h264 headers from v4l2 to allow stream-copying.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This moves some allocations to init, reducing possible failure modes in update.
Always copies from the previous context instead of just during init

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

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

Fixes ticket #2882.
Analyzed and tested by William C Bonner.

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

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

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

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

The pixel format descriptors are set to more or less arbitrary
values as bayer formats do not fit in the descriptors structure.
These values are currently not used for bayer formats and thus
do not matter.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  pcm-dvd: Fix build on big endian

See: 789cd1deMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'f4ca970d':
  configure: Add docdir configuration option

Conflicts:
	configure
	doc/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'faa8245b':
  vf_lut: Constantize

Conflicts:
	libavfilter/vf_lut.c

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

This prevents a potential crash
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Martin Storsjö <martin@martin.st>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a42e3a67':
  pcm_dvd: consolidate pieces from pcm.c and mpeg.c

Conflicts:
	libavcodec/pcm.c
	libavcodec/version.h
	libavformat/mpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Should address trac ticket #2621.