Merge commit '894545cb717427a47f800dc7738b923afde139a6'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Dec 2014 22:07:47 +0000 (23:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 5 Dec 2014 22:08:40 +0000 (23:08 +0100)
commitd94a475c59e9ea871b7dc783acf6ccd5eca84339
tree56ed1b3476d31c3650a0ec7e77ea0bed98ad47f8
parent2e59e6ff682dcc77f992758ea503f81b5fc6e858
parent894545cb717427a47f800dc7738b923afde139a6
Merge commit '894545cb717427a47f800dc7738b923afde139a6'

* commit '894545cb717427a47f800dc7738b923afde139a6':
  mpegvideo: exit cleanly when ff_mpv_common_frame_size_change() fails

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