-
Michael Niedermayer authored
* commit '9b749c82': h264: move relevant fields from Picture to H264Picture Conflicts: libavcodec/h264.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
c237e88d
* commit '9b749c82': h264: move relevant fields from Picture to H264Picture Conflicts: libavcodec/h264.c Merged-by:Michael Niedermayer <michaelni@gmx.at>