Merge commit 'b513bf6f69e26e724de6d5dca642c3582dcd0517'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 12:02:31 +0000 (14:02 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 12:02:31 +0000 (14:02 +0200)
commit213e82b55c28d28860ec9a7ace8335df860a4c50
treed1996e13fdfd392ee530b2bea60c029acc0923c9
parent56d3cd1455ea1970165a3ca047a97c3e43a9e9aa
parentb513bf6f69e26e724de6d5dca642c3582dcd0517
Merge commit 'b513bf6f69e26e724de6d5dca642c3582dcd0517'

* commit 'b513bf6f69e26e724de6d5dca642c3582dcd0517':
  yuv4mpegdec: do not set coded_frame properties

Conflicts:
libavformat/yuv4mpegdec.c

See: b45a3e167f497d82effbf8ada453ea47b0ee21da
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/yuv4mpegdec.c