avformat/isom: fix mix of declaration and statement

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'e843612695007cc623813073754c651ab43021f7'

* commit 'e843612695007cc623813073754c651ab43021f7':
  af_channelmap: fix ONE_STR mapping mode

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  FATE: add a test for the ONE_STR mapping mode of the channelmap filter

Conflicts:
	tests/fate/filter-audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg_opt: check that a subtitle encoder is available before auto mapping streams

Fixes Ticket3470

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/movenc: only ommit encoder tag of the metadata for bitexact mode

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/movenc: omit LIBAVCODEC_IDENT for bitexact mode from uuidusmt_tag

This code is apparently not tested by fate

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avformat/movenc: omit avformat ident from isml_manifest for bitexact mode

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/vf_tinterlace: Fix vf_tinterlace mode 6 (interlacex2)

The purpose of this filter mode is to allow interlaced content to
display properly in interlaced video modes, as described in
http://forum.xbmc.org/showthread.php?tid=81834 and
https://github.com/mpv-player/mpv/issues/624#issuecomment-37685195 . The
filter doubles the video frame rate, but does not work properly because:
(1) it does not set the properties of the output stream to indicate the
doubled frame rate, and
(2) it does not set an appropriate PTS on the extra frames.
The attached patch fixes these problems by settling these values the
same way they are set in vf_yadif mode 1 (field) which also doubles the
frame rate.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/rawdec: decode 16-bit aligned and packed 'raw' pixel formats where bits_per_coded_sample < 16

The bit packing method is communicted via codec_tag:
    BIT[0]  big-endian packing
    BIT[16] 16-bit little endian packing
    BIT[32] 32-bit little-endian packing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Phantom Cine demuxer (iteration 2014.3)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Changelog: move post 2.2 branching entries out of the 2.2 changelog

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
aacdec: Don't count probed ADTS frames if there are false positives

If a portion of the probe buffer seem to resemble ADTS frames,
but some data at the end is a mismatch, disregard the whole
probing attempt. If it actually is ADTS data, there shouldn't be
any mismatches within the sequential frame data.

Signed-off-by: Martin Storsjö <martin@martin.st>
aacdec: Lower the number of frames required to detect ADTS

For live audio streams, requiring 500 frames for a stream to
be detected is a bit overkill.

This allows live ADTS streams that don't start nicely at
a frame boundary to start up more quickly, e.g.
http://mp3.streampower.be/radio1.aac.

Signed-off-by: Martin Storsjö <martin@martin.st>
Merge commit '0412cb67cda05b08dfca6bfc4ff664ea917fa932'

* commit '0412cb67cda05b08dfca6bfc4ff664ea917fa932':
  aacdec: Don't count probed ADTS frames if there are false positives

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  aacdec: Lower the number of frames required to detect ADTS

Merged-by: Michael Niedermayer <michaelni@gmx.at>
mpegvideo: directly use frames in ff_draw_horiz_band()
h264: directly use frames in ff_h264_draw_horiz_band()
er: move relevant fields from Picture to ERPicture

This is done to disentangle ER from mpegvideo. In order to use a
classic Picture, callers can use ff_mpeg_set_erpic() or use a custom function
to set the fields. Please note that buffers need to be allocated before
calling ff_er_frame_end().
h264: move relevant fields from Picture to H264Picture
h264: Replace mpegvideo-specific MAX_PICTURE_COUNT by private define