[FFmpeg-cvslog] Merge commit '09c848855a7bf11a9ab4a69971cced260b17817d' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sat Oct  4 23:02:38 2014 +0200| [91ff803a748c273044e7a1dc36cdd4cfff4d079a] | committer: Michael Niedermayer

Merge commit '09c848855a7bf11a9ab4a69971cced260b17817d' into release/2.4

* commit '09c848855a7bf11a9ab4a69971cced260b17817d':
  h264: Always invoke the get_format() callback

Conflicts:
	libavcodec/h264_slice.c

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

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