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)
commitebefc92a3dcd88d2b5e97c221f7d1cff657a1e60
treebe084e4394c13c6621c741f58ebd8e6f995f12e8
parent11b3462aa347f65f296ba31140eaf32590c575b5
parent945a1b7ab9b9df317e175e480a135a41e7e05b5c
Merge commit '945a1b7ab9b9df317e175e480a135a41e7e05b5c' into release/1.1

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

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