aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/pnm.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-01 18:00:27 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-01 18:03:55 +0200
commitd1c359777f3ebccb7565043cd79347ab305758d8 (patch)
tree2b128fe5b09fbda7ffb17084c952e71fa81044ce /libavcodec/pnm.c
parentb917d7024e3613155b3c6428ad9049156d55286d (diff)
parente7fc9796d82abc99ef0af71027fb9aaa5311d137 (diff)
downloadffmpeg-d1c359777f3ebccb7565043cd79347ab305758d8.tar.gz
Merge commit 'e7fc9796d82abc99ef0af71027fb9aaa5311d137'
* commit 'e7fc9796d82abc99ef0af71027fb9aaa5311d137': lavc: do not use AVCodecContext.codec_name in avcodec_string() Conflicts: libavcodec/utils.c See: d2d7b7134fc387837d51aa1d7f3dbe090d35e8b4 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pnm.c')
0 files changed, 0 insertions, 0 deletions