-
Michael Niedermayer authored
* commit 'd66e305b': er: move relevant fields from Picture to ERPicture Conflicts: libavcodec/error_resilience.c libavcodec/h264.c Merged-by:
Michael Niedermayer <michaelni@gmx.at>
533bc4c0
* commit 'd66e305b': er: move relevant fields from Picture to ERPicture Conflicts: libavcodec/error_resilience.c libavcodec/h264.c Merged-by:Michael Niedermayer <michaelni@gmx.at>