aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mjpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-08-06 19:03:33 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-08-06 19:04:04 +0200
commit1faece7eccdb35df1cdd5363c4bbc67f6a668755 (patch)
tree3aae2905889e4351a311e8077b8f266570c21247 /libavcodec/mjpeg.c
parent0a8f5eb23a2d95f2bab6a0e7e19cc838d99fcdf1 (diff)
parent406e6c0ba5393fa302080202fe77bd09187889a1 (diff)
downloadffmpeg-1faece7eccdb35df1cdd5363c4bbc67f6a668755.tar.gz
Merge commit '406e6c0ba5393fa302080202fe77bd09187889a1'
* commit '406e6c0ba5393fa302080202fe77bd09187889a1': configure: Properly split avserver component and system dependencies Conflicts: configure Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpeg.c')
0 files changed, 0 insertions, 0 deletions