OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e8ac905 ad01fae)
Merge remote-tracking branch 'cus/stable'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 7 Dec 2013 15:11:22 +0000 (16:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 7 Dec 2013 15:11:25 +0000 (16:11 +0100)
commitc6959918f6ce82ae9a4a60af869f63ffa43f596d
tree2cd570fd9ddcaa1228af4fdff5cd7393e3c2a726tree | snapshot
parente8ac905daea47572abf90c873cd184dbfbbf34a7commit | diff
parentad01fae86d80c8a7ac87f6203d87418b898e62abcommit | diff
Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: set default window size before starting audio
  ffplay: factor out function setting default window size
  ffplay: remove no longer necessary codec flush
  ffplay: do not wait for flushing the picture queue on flush packet

Merged-by: Michael Niedermayer <michaelni@gmx.at>
external/ffmpeg
About OSDN
Find Software
Develop Software
Help