aboutsummaryrefslogtreecommitdiffstats
path: root/COPYING.GPLv3
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-05 22:46:46 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-05 22:48:47 +0100
commit9222a176e14847a8751e8d799799573e652550ad (patch)
tree56ed1b3476d31c3650a0ec7e77ea0bed98ad47f8 /COPYING.GPLv3
parent9d921cce4f5501e4c507cc921f76a283bee39d09 (diff)
parentc45eeb2dbf42382d335da8068231a8026c08843b (diff)
downloadffmpeg-9222a176e14847a8751e8d799799573e652550ad.tar.gz
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>
Diffstat (limited to 'COPYING.GPLv3')
0 files changed, 0 insertions, 0 deletions