[FFmpeg-cvslog] Merge commit 'cf280ed004b5c618560f8f43d14ff264bd1e4c3d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jul  8 21:38:17 2014 +0200| [839688bc63e1581dd82e8e51b7fb0c982a483876] | committer: Michael Niedermayer

Merge commit 'cf280ed004b5c618560f8f43d14ff264bd1e4c3d'

* commit 'cf280ed004b5c618560f8f43d14ff264bd1e4c3d':
  avplay: Handle pixel aspect ratio properly

See: 32fdfdfbdac64c57b12910521af1379a24d01f73
See: 99b01e458c268cf18ac0981e644e0f835957498a
See: 825ec16da955fd9c726d8e6c846cf9257a781a87
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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