[FFmpeg-cvslog] Merge commit '28240a60c1b5ce276e947ba013271ec009adc078'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov  1 19:19:58 2013 +0100| [382545ae62ca2cd5ae75b4e951e7ad659e3cc5fb] | committer: Michael Niedermayer

Merge commit '28240a60c1b5ce276e947ba013271ec009adc078'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=382545ae62ca2cd5ae75b4e951e7ad659e3cc5fb
---