mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-10 01:30:21 +02:00
Merge commit 'e7fc9796d82abc99ef0af71027fb9aaa5311d137'
* commit 'e7fc9796d82abc99ef0af71027fb9aaa5311d137':
lavc: do not use AVCodecContext.codec_name in avcodec_string()
Conflicts:
libavcodec/utils.c
See: d2d7b7134f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
d1c359777f