Merge commit '7a38987f245e3c280d81442f207b983333b6233c'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Dec 2014 22:06:36 +0000 (23:06 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Dec 2014 22:07:20 +0000 (23:07 +0100)
commit2e59e6ff682dcc77f992758ea503f81b5fc6e858
tree56ed1b3476d31c3650a0ec7e77ea0bed98ad47f8
parent9222a176e14847a8751e8d799799573e652550ad
parent7a38987f245e3c280d81442f207b983333b6233c
Merge commit '7a38987f245e3c280d81442f207b983333b6233c'

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

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