aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/jpeglsenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-11 11:49:47 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-11 11:49:47 +0200
commit99091ff217440daa33fddcf66170e1a6d630c3a4 (patch)
tree8146302a4c2f83b05eb2ecc2a99ec131360e2feb /libavcodec/jpeglsenc.c
parent5993b962691ae29b6563785d26ef2a19ffa97f4c (diff)
parent205a4502d3da9de2db75d2c965c9d065574e9266 (diff)
downloadffmpeg-99091ff217440daa33fddcf66170e1a6d630c3a4.tar.gz
Merge commit '205a4502d3da9de2db75d2c965c9d065574e9266'
* commit '205a4502d3da9de2db75d2c965c9d065574e9266': doc: Clarify the avconv section about -re Conflicts: doc/ffmpeg.texi Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeglsenc.c')
0 files changed, 0 insertions, 0 deletions