Merge commit '66499f34b56fc6a9fdef25543bd9d576fc787895'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 03:09:47 +0000 (04:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Dec 2013 03:09:47 +0000 (04:09 +0100)
commit0d9f2f5c47a008d3077510e499d68a4e960e2c66
tree259a63de479dfccd0e5f777e043d73aebec16aab
parent28eacd135162e34379b5c0146ad41a3601f35cd8
parent66499f34b56fc6a9fdef25543bd9d576fc787895
Merge commit '66499f34b56fc6a9fdef25543bd9d576fc787895'

* commit '66499f34b56fc6a9fdef25543bd9d576fc787895':
  mpegvideo: do not set current_picture_ptr in decoders

Conflicts:
libavcodec/mss2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h261dec.c
libavcodec/mss2.c
libavcodec/vc1dec.c