aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mjpegenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-05-06 10:19:56 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-05-06 10:19:56 +0200
commit5c2ccf83df3bfea03c843910c41ee99bd4d64129 (patch)
treeb65afff2fa2bbdb0223295c5f0d54ca7107e0e13 /libavcodec/mjpegenc.c
parentf5846dc98cee1fd2530565a9a87c602714eb597b (diff)
parent7abd35a1ffaecfd79fa07b801621ee11ab595c43 (diff)
downloadffmpeg-5c2ccf83df3bfea03c843910c41ee99bd4d64129.tar.gz
Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43'
* commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43': avformat: Add av_cold attributes to init functions missing them Conflicts: libavformat/rtpdec_xiph.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegenc.c')
0 files changed, 0 insertions, 0 deletions