git.sesse.net Git - ffmpeg/commit

]> git.sesse.net Git - ffmpeg/commit

author	Derek Buitenhuis <derek.buitenhuis@gmail.com>
	Sun, 22 Nov 2015 17:19:10 +0000 (17:19 +0000)
committer	Derek Buitenhuis <derek.buitenhuis@gmail.com>
	Sun, 22 Nov 2015 17:19:10 +0000 (17:19 +0000)
commit	ad317c94c5fad00f97881263647e316344f0a81e
tree	5a505dbfe80d7d795004c16a519baeb3457f8e0c	tree \| snapshot
parent	2bf93dfd96549777701a2031c23dac2cdb7257ee	commit \| diff
parent	7f4ec4364bc4a73036660c1c6a3c4801db524e9e	commit \| diff

Merge commit '7f4ec4364bc4a73036660c1c6a3c4801db524e9e'

* commit '7f4ec4364bc4a73036660c1c6a3c4801db524e9e':
  avformat: expose av_stream_new_side_data helper

  Conflicts:
      libavformat/internal.h

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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