Merge commit '925b80d64029d41962e5998d7d901226c3a9baea'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jun 2015 20:05:20 +0000 (22:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Jun 2015 20:05:25 +0000 (22:05 +0200)
commit83e3516e64dcc1581ae7503be3aaca6a34be7194
treed2c8b6abe6b91cfc783185490f3dddcf55415501
parent3244a176505b04f62f7bbb1ac7fb413399a6790c
parent925b80d64029d41962e5998d7d901226c3a9baea
Merge commit '925b80d64029d41962e5998d7d901226c3a9baea'

* commit '925b80d64029d41962e5998d7d901226c3a9baea':
  mpegvideo: Move OutFormat enum to mpegutils.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h263dec.c
libavcodec/mpegutils.h
libavcodec/mpegvideo.h
libavcodec/rv10.c
libavcodec/wmv2.c