Merge commit 'ec0df23765bd41846f66e4a4fb694779b432fc62' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 20:44:20 +0000 (21:44 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Mar 2015 20:44:24 +0000 (21:44 +0100)
commit7801f3e509acf4adee00ac765c54a8835e8dba8e
tree84184692fe3ab2a52efbfe2ff1de80cb301116a6
parent240d7a7fc209852f953852f568c962e66094f6c4
parentec0df23765bd41846f66e4a4fb694779b432fc62
Merge commit 'ec0df23765bd41846f66e4a4fb694779b432fc62' into release/0.10

* commit 'ec0df23765bd41846f66e4a4fb694779b432fc62':
  h264: Remove an assert on current_picture_ptr being null

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