[FFmpeg-cvslog] Merge commit '7fd6c9fb49573870b48a995947edc83eedd7e86e' into release/1.1

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 21 15:28:24 2014 +0200| [11dfd2a74a331f47135d3e0bcd5d503750e66004] | committer: Michael Niedermayer

Merge commit '7fd6c9fb49573870b48a995947edc83eedd7e86e' into release/1.1

* commit '7fd6c9fb49573870b48a995947edc83eedd7e86e':
  h264: reset first_field if frame_start() fails for missing refs

Conflicts:
	libavcodec/h264.c

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

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