Merge commit '945a1b7ab9b9df317e175e480a135a41e7e05b5c' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 4 May 2014 20:14:42 +0000 (22:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 4 May 2014 20:14:45 +0000 (22:14 +0200)
* commit '945a1b7ab9b9df317e175e480a135a41e7e05b5c':
  h264: reset next_output_pic earlier in start_frame()

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

Simple merge