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>
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>
tests: remove stale fate-update.sh script

This is the same as 5a15602a4e99c730036c33b467f60248889219e1, which
accidentally did not get merged.

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Fix nonsense non-mod16 AMV flipping code.

It is obviously nonsense since it produces wrong results
or even crashes (crashes should be encode-only though).
Fixes trac issue #1092.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/mjpegenc: allow encoding amv with height % 16 != 0 when strict -1 is set

This should make it simpler for users to test if such videos work

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