Merge commit 'db0a943266be29ff0596872ebb418dfed75d00de'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Feb 2013 11:47:02 +0000 (12:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 10 Feb 2013 11:47:37 +0000 (12:47 +0100)
commitd80820655362645ae1c65d457287d7d12c04a44f
treee1066d348d7ca9e9b4a156f76b7d2766602dbded
parent30085bd43e35acf931429dc445db5bc1869be022
parentdb0a943266be29ff0596872ebb418dfed75d00de
Merge commit 'db0a943266be29ff0596872ebb418dfed75d00de'

* commit 'db0a943266be29ff0596872ebb418dfed75d00de':
  avplay: apply the stream sample_aspect_ratio to decoded video frames

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