[FFmpeg-cvslog] Merge commit '5eb488bfa835f2902a31ba99d57c16ae36c4f598'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug 11 10:28:49 2013 +0200| [d2d8e259fd2e5149546431b6c7d1cd3560b7ab97] | committer: Michael Niedermayer

Merge commit '5eb488bfa835f2902a31ba99d57c16ae36c4f598'

* commit '5eb488bfa835f2902a31ba99d57c16ae36c4f598':
  h264: use explicit variable names for *_field_flag

Conflicts:
	libavcodec/h264.c

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

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