diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-24 21:27:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-24 21:27:09 +0200 |
| commit | 277ae5a7b30496eabfb35b4dd6a62a335a422085 (patch) | |
| tree | 8b103f7a61bed8a88062ad9bac50943ca85a1090 /libavformat/nut.c | |
| parent | 31f2357fd0e273365b1ae667e191638937e188e3 (diff) | |
| parent | 374fdc8c071dcd96422378b0a1a0d453336d8a01 (diff) | |
| download | ffmpeg-277ae5a7b30496eabfb35b4dd6a62a335a422085.tar.gz | |
Merge commit '374fdc8c071dcd96422378b0a1a0d453336d8a01'
* commit '374fdc8c071dcd96422378b0a1a0d453336d8a01':
flv: Improve log messages
Conflicts:
libavformat/flvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nut.c')
0 files changed, 0 insertions, 0 deletions