* commit '2c10e2a2':
  build: Make the H.264 parser select h264qpel
  x86: h264qpel: add cpu flag checks for init function

Conflicts:
	libavcodec/x86/h264_qpel.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

Now allocation is done only if av_image_check_size() passes.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

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

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

* commit '6bdb841b':
  arm: h264qpel: use neon h264 qpel functions only if supported

* bug was fixed previously (in merge of buggy code):
  h264: copy h264qpel dsp context to slice thread copies
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes out of array writes

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes out of array reads

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes out of array access

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes ticket #2183.

Found-By: Justin Ruggles

Fixes out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

These where lost when libav moved the code out of dsputil
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes integer overflow and prints an error in case the value is
invalid.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Reviewed-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

It is required for building the shared H.264 code.

The code was copied from per cpu extension init function so the checks
for supported extensions was overlooked.

The fps is stored as a 8 bit value thus 255 is the maximum encodable.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes part of Ticket2045
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes part of Ticket2045
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Fixes Ticket2147
Fixes SageTV support

Based-on patch by Andrew Gallatin
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

It is supposed to be set from lavc only.
Also this one differs from one set in decoder.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

It is supposed to be set from lavc only.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

* qatar/master:
  dsputil: Separate h264 qpel

Conflicts:
	libavcodec/dsputil_template.c
	libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '7a95afe4':
  doc: fix dependencies in pod generation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '528878ee':
  openbsd: configure: Stop enabling PIC by default

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

* commit '4a4a7e13':
  rtpenc_chain: Use the original AVFormatContext for getting payload type
  rtp: Make sure the output format pointer is set
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This should have become redundant
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '57ed8deb':
  wmv2: Propagate the wmv2 idct permutation type to the dsputils context
  rtp: Make sure priv_data is set before reading it
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fixes -codec copy with TTA from matroska to matroska.
Signed-off-by: Paul B Mahol <onemda@gmail.com>