diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-12 15:21:15 +0200 |
|---|---|---|
| committer | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2015-11-26 01:37:56 +0100 |
| commit | 4202e9d9724471c339b207af647c13cc6689c615 (patch) | |
| tree | 102b491b4b6d0c2605781302d88b40d484e6134b /libavformat/mpegtsenc.c | |
| parent | 6c36f0b57c6e80b7e5980fc3755c5f396254e622 (diff) | |
| download | ffmpeg-4202e9d9724471c339b207af647c13cc6689c615.tar.gz | |
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>
(cherry picked from commit ba77fb61f741d9ab3bd12935527556055b2ffb2e)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Diffstat (limited to 'libavformat/mpegtsenc.c')
0 files changed, 0 insertions, 0 deletions