OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d86e277 ca41c72)
Merge commit 'ca41c72c6d9515d9045bd3b68104525dee81b8d0'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Nov 2013 11:10:17 +0000 (12:10 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Nov 2013 11:25:01 +0000 (12:25 +0100)
commit8c63ee4296a87d1fdbbce5501230b6fd9c8d04d8
treee8e65bb784d9472beb2fc0678e055d260afd7727tree | snapshot
parentd86e27758f4d691506e50d72fca97f0ec72d9ea0commit | diff
parentca41c72c6d9515d9045bd3b68104525dee81b8d0commit | diff
Merge commit 'ca41c72c6d9515d9045bd3b68104525dee81b8d0'

* commit 'ca41c72c6d9515d9045bd3b68104525dee81b8d0':
  motionpixels: clip VLC codes.

Not merged, the change is wrong, the condition is not possible unless
there are serious bugs elsewhere. No such bugs should exist in ffmpeg.

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