[FFmpeg-cvslog] Merge commit '17e7c03e12d1e4490921e7bffaeaa6b46a7ada4e'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Fri Jul 29 09:58:39 2016 +0200| [a63c73122e90fded87d3cb281cc85685c9425a84] | committer: Clément Bœsch

Merge commit '17e7c03e12d1e4490921e7bffaeaa6b46a7ada4e'

* commit '17e7c03e12d1e4490921e7bffaeaa6b46a7ada4e':
  h264: only allow ending a field/starting a new one before finish_setup()

This commit is a noop. According to Michael, after 8385e171 this commit
should not be necessary anymore.

Merged-by: Clément Bœsch <u at pkh.me>

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