Merge commit '28240a60c1b5ce276e947ba013271ec009adc078'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 18:19:58 +0000 (19:19 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 18:20:02 +0000 (19:20 +0100)
commit382545ae62ca2cd5ae75b4e951e7ad659e3cc5fb
tree0bbdf6132a5423b9dea6f3570bd5d23c933ce192
parent935d0ee08d0ef964c02556fc694f1e8b3b69d7d4
parent28240a60c1b5ce276e947ba013271ec009adc078
Merge commit '28240a60c1b5ce276e947ba013271ec009adc078'

* commit '28240a60c1b5ce276e947ba013271ec009adc078':
  lavc: move FF_ASPECT_EXTENDED from avcodec.h to h263.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avcodec.h
libavcodec/h263.h
libavcodec/version.h