aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/rtjpeg.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-03-30 02:58:38 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-03-30 02:58:38 +0200
commit55ce3c67bb25cd44889f2143ce9fd7dac3ab4a9d (patch)
tree20f16981174b1d3469daf22217b98e24e311e62f /libavcodec/rtjpeg.h
parentcd39549e2c386edfa5f4d4bdc0cda78f882a4fe4 (diff)
downloadffmpeg-55ce3c67bb25cd44889f2143ce9fd7dac3ab4a9d.tar.gz
Merge remote-tracking branch 'ffmpeg-mt/master'
* ffmpeg-mt/master: Update todo. More items appeared... Fix mdec Duplicate: id3v1: change filesize to int64_t. Duplicate: id3v1: Seek back to old position after reading. Conflicts: libavcodec/mpegvideo.c libavcodec/snow.c libavformat/id3v1.c Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rtjpeg.h')
0 files changed, 0 insertions, 0 deletions