OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4e40e61 b82722d)
Merge commit 'b82722df9b2911bd41e0928db4804067b39e6528'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 13:21:49 +0000 (14:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 13:22:35 +0000 (14:22 +0100)
* commit 'b82722df9b2911bd41e0928db4804067b39e6528':
  hevc: reindent after previous commit

Conflicts:
libavcodec/hevc.c

See: f8ecffa9b7e49860ce030fb3cabb60b3143384db
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge
external/ffmpeg
About OSDN
Find Software
Develop Software
Help