[FFmpeg-cvslog] Merge commit 'c45eeb2dbf42382d335da8068231a8026c08843b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec  5 22:46:46 2014 +0100| [9222a176e14847a8751e8d799799573e652550ad] | committer: Michael Niedermayer

Merge commit 'c45eeb2dbf42382d335da8068231a8026c08843b'

* commit 'c45eeb2dbf42382d335da8068231a8026c08843b':
  mpegvideo: replace assert about interlaced EC with debug av_log()

Conflicts:
	libavcodec/mpegvideo.c

See: c88bbc01eb7f67f7399fb89800bf1bfc89edb248
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9222a176e14847a8751e8d799799573e652550ad
---