OSDN Git Service

Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Dec 2013 15:32:43 +0000 (16:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Dec 2013 15:32:46 +0000 (16:32 +0100)
* cus/stable:
  ffplay: do not wait for the picture allocation to finish on exit
  ffplay: remove two unneeded av_free_packet calls
  ffplay: remove some unneded av_frame_unref calls
  ffplay: remove unneeded avcodec_get_frame_defaults
  ffplay: use precalculated frame size and bytes per sec values
  ffplay: precalculate audio output frame size and byte per sec

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

Trivial merge