]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9bb86fa d8b6866)
Merge commit 'd8b68660145c76a23fc9665f96932449514ecad2'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 12:37:52 +0000 (14:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 12:37:52 +0000 (14:37 +0200)
* commit 'd8b68660145c76a23fc9665f96932449514ecad2':
  yop: Clear all references to the AVBuffer in the local AVPacket

Conflicts:
libavformat/yop.c

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

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