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)
commit09b09ef4ab5c20feb815cb6ef7a297b8c046f44e
treef44f337cccec014c2a323313d47f7961a7b819ce
parent9bb86faca7936f6dba93aa3b11fc24f19c7878a4
parentd8b68660145c76a23fc9665f96932449514ecad2
Merge commit 'd8b68660145c76a23fc9665f96932449514ecad2'

* 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>
libavformat/yop.c