Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 18 May 2012 02:45:14 +0000 (04:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 18 May 2012 02:45:18 +0000 (04:45 +0200)
commitae1ab8265bad5481b5842ee3aff4872d1fe4d34d
tree781f3b1c22a8493a79a31dbbbbd084b58820c7a7
parentdb6ef054f55213eec440f6faa609abe61eaa9315
parent825ec16da955fd9c726d8e6c846cf9257a781a87
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: put aspect ratio info to the VideoPicture struct
  ffplay: use AVFrame::width and height instead of using codec or filter settings
  ffplay: use stream sample_aspect_ratio if available in source frames
  ffplay: fix video_thread when no frame is returned in get_video_frame

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