-
Michael Niedermayer authored
* commit '9d33bab5': h264: drop H264Context.ouputed_poc Conflicts: libavcodec/h264.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
e8a46067
* commit '9d33bab5': h264: drop H264Context.ouputed_poc Conflicts: libavcodec/h264.c Merged-by:Michael Niedermayer <michaelni@gmx.at>