OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1acd029 ac7b4bf)
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)
commit828ac6d1b515ce421519a641b23b05127acc06cd
treeed53e59eae42529a062c7d23558f6bbde7d7fcfbtree | snapshot
parent1acd029f40de1a0d3ca292cbbe06ea5a173a84aecommit | diff
parentac7b4bfdeb6af11348f15d4a308fcbe61e68b58bcommit | diff
Merge remote-tracking branch 'cus/stable'

* 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>
external/ffmpeg
About OSDN
Find Software
Develop Software
Help