]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 43633c5 c5560e7)
Merge commit 'c5560e72d0bb69f8a1ac9536570398f84388f396'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Sep 2014 18:38:56 +0000 (20:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 17 Sep 2014 18:42:26 +0000 (20:42 +0200)
* commit 'c5560e72d0bb69f8a1ac9536570398f84388f396':
  apetag: Fix APE tag size check

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/apetag.c patch | diff1 | diff2 | blob | history

diff --cc libavformat/apetag.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.