Merge commit '407912d17870a53e8a8cc072f192cadf358bc155' into release/2.2
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Jul 2014 18:14:09 +0000 (20:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Jul 2014 18:14:33 +0000 (20:14 +0200)
* commit '407912d17870a53e8a8cc072f192cadf358bc155':
  avplay: Handle pixel aspect ratio properly

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

Trivial merge