[FFmpeg-cvslog] Merge commit 'c7caed88a03567e8777a606f4bd42f093c6b302c' into release/2.2

[Michael Niedermayer]

ffmpeg | branch: release/2.2 | Michael Niedermayer <michaelni at gmx.at> | Sat Nov  1 15:08:51 2014 +0100| [2d1d053c5d2ca59c8c0f35d91404cd899267add1] | committer: Michael Niedermayer

Merge commit 'c7caed88a03567e8777a606f4bd42f093c6b302c' into release/2.2

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

Conflicts:
	libavcodec/h264.c

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

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