Merge commit 'c1f92d13589d431e576d719dd44427486a5e05cd'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Apr 2014 22:28:47 +0000 (00:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Apr 2014 22:28:51 +0000 (00:28 +0200)
commitb3d48c315dece7bc599012075cc92e9a80cdd6ec
treeb5ba1474ee20adf7b264bc14e1b8439163beb525
parent8b30702c44040c13abe759fa48673af7af417de9
parentc1f92d13589d431e576d719dd44427486a5e05cd
Merge commit 'c1f92d13589d431e576d719dd44427486a5e05cd'

* commit 'c1f92d13589d431e576d719dd44427486a5e05cd':
  mpegvideo: remove unused MpegEncContext.b4_stride

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h