Merge commit '9f99a5f1d078721a30a76aec27c58805b7b87e58'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 20 Jul 2014 18:32:17 +0000 (20:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 20 Jul 2014 18:32:24 +0000 (20:32 +0200)
commit02e3e3ea51ffba4067cbd8595396ec677af1f694
tree854f1f6f55c25a8f82b3f76350fed9a7782120f7
parente2842cfe76c92a083c77c3b09427ff3d60e03f99
parent9f99a5f1d078721a30a76aec27c58805b7b87e58
Merge commit '9f99a5f1d078721a30a76aec27c58805b7b87e58'

* commit '9f99a5f1d078721a30a76aec27c58805b7b87e58':
  mpegencconetxt: Move rv10-specific orig_width/orig_height where they belong

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