Merge commit '0ddc53dabbc6f636d062b187ea27934610aaad30'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Jun 2014 20:29:40 +0000 (22:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Jun 2014 20:30:49 +0000 (22:30 +0200)
commit67911cc57bbe2958fe62ca092b0e43438cd0ba52
tree873398d40e59e3d2cf6b895ecadcc24d6c388a6a
parent67d29da4bd23057a1f646568442a77b844cb2d1b
parent0ddc53dabbc6f636d062b187ea27934610aaad30
Merge commit '0ddc53dabbc6f636d062b187ea27934610aaad30'

* commit '0ddc53dabbc6f636d062b187ea27934610aaad30':
  mpegvideo: synchronize AVFrame pointers in ERContext fully

Conflicts:
libavcodec/mpegvideo.c

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