OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4853b55 f05e9be)
Merge commit 'f05e9beb4ab5fb8b9d5ba81405e9fca901832591'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Mar 2013 10:48:42 +0000 (11:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Mar 2013 10:48:42 +0000 (11:48 +0100)
commit33ecf7ab5980c7b113b25cb650418ee5d4589490
tree427763bdb86d5d62b2875652263ca6a97d792023tree | snapshot
parent4853b5538f416ba4d519244fde8c14f2ff75e07bcommit | diff
parentf05e9beb4ab5fb8b9d5ba81405e9fca901832591commit | diff
Merge commit 'f05e9beb4ab5fb8b9d5ba81405e9fca901832591'

* commit 'f05e9beb4ab5fb8b9d5ba81405e9fca901832591':
  ismindex: Rename structs and fields from "file" to "track"
  avpacket: copy side data type and size in av_dup_packet

Conflicts:
libavcodec/avpacket.c

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