]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7cfaf72 25b143a)
Merge remote-tracking branch 'mbouron/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Apr 2013 11:57:29 +0000 (13:57 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Apr 2013 11:57:36 +0000 (13:57 +0200)
* mbouron/master:
  lavf/mxfdec: handle identification metadata

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.