-
Michael Niedermayer authored
* qatar/master: mpeg12dec: do not add stereo3D side data to a non-existing frame Conflicts: libavcodec/mpeg12dec.c See: fe285b04Merged-by: Michael Niedermayer <michaelni@gmx.at>
abe3f79d
* qatar/master: mpeg12dec: do not add stereo3D side data to a non-existing frame Conflicts: libavcodec/mpeg12dec.c See: fe285b04Merged-by: Michael Niedermayer <michaelni@gmx.at>