[FFmpeg-cvslog] Merge commit 'b3dc260e7fa6f3f852dd5cb7d86763c4b5736714'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug 11 10:08:48 2013 +0200| [e0b45ca730f2b805d1d111067e1a99bff4516549] | committer: Michael Niedermayer

Merge commit 'b3dc260e7fa6f3f852dd5cb7d86763c4b5736714'

* commit 'b3dc260e7fa6f3f852dd5cb7d86763c4b5736714':
  h264: return meaningful values

Conflicts:
	libavcodec/h264.c

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

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