OSDN Git Service

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)
* 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>

Trivial merge