]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2ad8056 72fe16a)
Merge commit '72fe16a13e3ebd5396ac173bf84c8b20085c16d5'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 10:37:24 +0000 (12:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 10:37:24 +0000 (12:37 +0200)
* commit '72fe16a13e3ebd5396ac173bf84c8b20085c16d5':
  movenc: Use null buffers for measuring the amount of data to be written

Conflicts:
libavformat/movenc.c

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

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