aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mqcenc.c
diff options
context:
space:
mode:
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>2015-11-22 17:19:10 +0000
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>2015-11-22 17:19:10 +0000
commitad317c94c5fad00f97881263647e316344f0a81e (patch)
tree5a505dbfe80d7d795004c16a519baeb3457f8e0c /libavcodec/mqcenc.c
parent2bf93dfd96549777701a2031c23dac2cdb7257ee (diff)
parent7f4ec4364bc4a73036660c1c6a3c4801db524e9e (diff)
downloadffmpeg-ad317c94c5fad00f97881263647e316344f0a81e.tar.gz
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>
Diffstat (limited to 'libavcodec/mqcenc.c')
0 files changed, 0 insertions, 0 deletions