OSDN Git Service

Merge commit 'c45eeb2dbf42382d335da8068231a8026c08843b'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Dec 2014 21:46:46 +0000 (22:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Dec 2014 21:48:47 +0000 (22:48 +0100)
commit9222a176e14847a8751e8d799799573e652550ad
tree56ed1b3476d31c3650a0ec7e77ea0bed98ad47f8
parent9d921cce4f5501e4c507cc921f76a283bee39d09
parentc45eeb2dbf42382d335da8068231a8026c08843b
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@gmx.at>
libavcodec/mpegvideo.c