* commit '2ade1cda':
  intrax8: K&R formatting cosmetics
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '6f5ff559':
  intrax8: Adjust printf conversion specifier for sizeof expression
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '42244ce0':
  intrax8: Move a comment to the place it corresponds
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '75056254':
  intrax8: Wrap multiline macros in do{}while(0) clauses
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '0c6a7087':
  intrax8: Move error resilience out of intrax8
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '709c0f79':
  nuv: Use the correct context for av_image_check_size
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '64250d94':
  indeo4: Consistently initialize variables
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '6202e2fe':
  indeo4: Rework stream analysis report
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

This commit is a no-op. We will do this when we convert ffmpeg.c

* commit '4426540f':
  avconv: switch to the new BSF API
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '33d18982':
  lavc: add a new bitstream filtering API
Conversions-by: Hendrik Leppkes <h.leppkes@gmail.com>
Conversions-by: Derek Buitenguis <derek.buitenhuis@gmail.com>
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

avfilter/vf_readvitc: Use avpriv_frame_get_metadatap() avoid direct access to AVFrame.metadata (to comply to API)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Reproduces a bug to remain consistent with libvpx' behaviour.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

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

Sometimes video fails to decode if H.264 configuration changes mid stream.
The reason is that configuration parser assumes that nal_ref_idc is equal to 11b
while actually some codecs but 01b there. The H.264 spec is somewhat
vague about this but it looks like it allows any non-zero nal_ref_idc for sps/pps.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

It was accidentally deleted in the previous hashenc commit
Signed-off-by: James Almer <jamrial@gmail.com>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Approximately 1.25 times faster than 64x32, visually and
statistically improves quality.
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

Typo
Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>

Add a filter to scan the top lines of video frames for vertical interval
timecode (VITC) information and attach it as metadata keys.
Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com>

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Reminded-by: James Almer
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes ticket #5410.

Fixes ticket #4667.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Suggestes-by: ubitux
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes ticket1680
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Fixes ticket #4441.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>

The bits_per_raw_sample represents the number of bits of precision per sample.

The field is added at the logical place, not at the end as the code was just
recently added

This fixes the regression about losing the audio sample precision information

The change in the fate test checksum un-does the change from the merge

Previous version reviewed by: wm4 <nfxjfg@googlemail.com>
Previous version reviewed by: Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

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

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

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

Needed for av_log() inside that function.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

Fixes Ticket 5438
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

This commit is a no-op.

* commit 'a2d1922b':
  takdec: ensure chan2 is a valid channel index
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

* commit '9765549f':
  mpegts: Forward the errors on mpeg4 objects parsing
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>