Merge commit 'd80811c94e068085aab797f9ba35790529126f85'
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 12 Jul 2015 13:21:15 +0000 (15:21 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 12 Jul 2015 13:22:37 +0000 (15:22 +0200)
commitba77fb61f741d9ab3bd12935527556055b2ffb2e
tree2dda7ae00512199a18ba46d717ef8cd8ce6d8559
parente72988d3f804fbcf628fa95cb7374ac05ae61d84
parentd80811c94e068085aab797f9ba35790529126f85
Merge commit 'd80811c94e068085aab797f9ba35790529126f85'

* commit 'd80811c94e068085aab797f9ba35790529126f85':
  riff: Use the correct logging context

Conflicts:
libavformat/asfdec_o.c
libavformat/avidec.c
libavformat/dxa.c
libavformat/matroskadec.c
libavformat/mov.c
libavformat/riff.h
libavformat/riffdec.c
libavformat/wavdec.c
libavformat/wtvdec.c
libavformat/xwma.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
13 files changed:
libavformat/act.c
libavformat/asfdec_f.c
libavformat/asfdec_o.c
libavformat/avidec.c
libavformat/dxa.c
libavformat/matroskadec.c
libavformat/mlvdec.c
libavformat/mov.c
libavformat/riff.h
libavformat/riffdec.c
libavformat/wavdec.c
libavformat/wtvdec.c
libavformat/xwma.c