[FFmpeg-cvslog] Merge commit '7a38987f245e3c280d81442f207b983333b6233c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec  5 23:06:36 2014 +0100| [2e59e6ff682dcc77f992758ea503f81b5fc6e858] | committer: Michael Niedermayer

Merge commit '7a38987f245e3c280d81442f207b983333b6233c'

* commit '7a38987f245e3c280d81442f207b983333b6233c':
  mpegvideo: free_context_frame() cannot fail, make it return void

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

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