OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 29c83d2 6139f48)
Merge commit '6139f481ac9feb1bee4e7d04789fb15d7f24ebbf'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Nov 2013 23:11:33 +0000 (00:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Nov 2013 23:11:33 +0000 (00:11 +0100)
commitcc4a6435638fa2a471fef048a3e68eaf7e6e306c
tree074304931d2c5f76d97868399a5b46214fe915cetree | snapshot
parent29c83d23e8edf47ce423f85d4a2f2081a674a940commit | diff
parent6139f481ac9feb1bee4e7d04789fb15d7f24ebbfcommit | diff
Merge commit '6139f481ac9feb1bee4e7d04789fb15d7f24ebbf'

* commit '6139f481ac9feb1bee4e7d04789fb15d7f24ebbf':
  asvenc: use the AVFrame API properly.
  a64multienc: use the AVFrame API properly.

Conflicts:
libavcodec/vaapi_mpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/a64multienc.c diff1 | diff2 | blob | history
libavcodec/asv.c diff1 | diff2 | blob | history
libavcodec/asv.h diff1 | diff2 | blob | history
libavcodec/asvenc.c diff1 | diff2 | blob | history
external/ffmpeg
About OSDN
Find Software
Develop Software
Help