flac muxer: support reading updated extradata from side data
avconv: do not use the stream codec context for decoding
avconv: do not use the stream codec context for encoding
Move Indeo4 frametypes into common header.

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Decode both parts of Indeo4 IP frames

Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
Merge commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52'

* commit 'e19d48dfce52f1417f7f06143b96fed00cbcdc52':
  flac muxer: support reading updated extradata from side data

Conflicts:
	libavformat/flacenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5'

* commit '41776ba9c0ebbb71394cefdf7dd1b243e6c852d5':
  avconv: do not use the stream codec context for decoding

Conflicts:
	ffmpeg.c
	ffmpeg_filter.c
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg: copy b frame codec delay back from decoder to demuxer

The demuxer needs this value to generate correct timestamps in some corner cases
Ideally the parser would always set this correctly, but some parsers lac support
for extracting this value, also its not trivial.
This fixes a regression

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg: replace remaining, ffmpeg specific ist->st->codec by ist->dec_ctx

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg: add note about why has_b_frame is copied and when it can be removed

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

* commit '383136264ef40452efd86cafb2d7221cd3830b3d':
  avconv: do not use the stream codec context for encoding

Conflicts:
	ffmpeg.c
	ffmpeg_opt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg_filter: fix choose_pix_fmts() so it uses the correct encoding context

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg: fix for-muxer AVCodecContext stuff

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg_opt: fix attachment streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg: Fix encoder names in printout

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg: Fix choose_pixel_fmt() so it uses the correct encoding context

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg_opt: fix ffserver with the 2 encoder contexts

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

* commit '3df0d20028cb9d2daca16ac0dc6c3ab77183da37':
  Move Indeo4 frametypes into common header.

Conflicts:
	libavcodec/ivi_common.c

See: d24673a2c80418c3c14dad523619f44f3ca8cb58
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Merge commit 'f76e3669bb350ca6df150244f3d28d7dc5599f01'

* commit 'f76e3669bb350ca6df150244f3d28d7dc5599f01':
  Decode both parts of Indeo4 IP frames

Conflicts:
	libavcodec/ivi_common.c
	libavcodec/ivi_common.h

See: 8bfb4d72dd9324fda14bb49dda3468ccba5873e2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
tests: Add pullup filter test

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