[FFmpeg-cvslog] Merge commit '945a1b7ab9b9df317e175e480a135a41e7e05b5c' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Sun May  4 22:14:42 2014 +0200| [ebefc92a3dcd88d2b5e97c221f7d1cff657a1e60] | committer: Michael Niedermayer

Merge commit '945a1b7ab9b9df317e175e480a135a41e7e05b5c' into release/1.1

* commit '945a1b7ab9b9df317e175e480a135a41e7e05b5c':
  h264: reset next_output_pic earlier in start_frame()

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ebefc92a3dcd88d2b5e97c221f7d1cff657a1e60
---