OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: db8403d 2c328a9)
Merge commit '2c328a907978b61949fd20f7c991803174337855'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Mar 2013 10:24:11 +0000 (11:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 20 Mar 2013 10:24:11 +0000 (11:24 +0100)
commit17ebef2fc8094a235c0f30ce247c77659ea86539
treee5e435fe4269c33888e1f55fc09b32e787e3479etree | snapshot
parentdb8403d04afc025278f611d43a91429bbfa44026commit | diff
parent2c328a907978b61949fd20f7c991803174337855commit | diff
Merge commit '2c328a907978b61949fd20f7c991803174337855'

* commit '2c328a907978b61949fd20f7c991803174337855':
  pixdesc: add a function for counting planes in a pixel format.
  avplay: remove the -debug option.
  Revert "asfenc: return error on negative timestamp"

Conflicts:
doc/APIchanges
doc/ffplay.texi
ffplay.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges diff1 | diff2 | blob | history
libavformat/asfenc.c diff1 | diff2 | blob | history
libavutil/pixdesc.c diff1 | diff2 | blob | history
libavutil/pixdesc.h diff1 | diff2 | blob | history
libavutil/version.h diff1 | diff2 | blob | history
external/ffmpeg
About OSDN
Find Software
Develop Software
Help