aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-12-02 20:03:24 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-12-02 20:08:01 +0100
commita6c455cf6bb239280cae19e0eb94fa453ced2db7 (patch)
treed445acdebd71cc68e0978b2576747721ee6ef727 /ffmpeg.c
parentc490cd4c1ae36246e9ae510c252dce65a432c125 (diff)
parentad477710244c761ad1c21246c34e0075fee12d11 (diff)
downloadffmpeg-a6c455cf6bb239280cae19e0eb94fa453ced2db7.tar.gz
Merge commit 'ad477710244c761ad1c21246c34e0075fee12d11'
* commit 'ad477710244c761ad1c21246c34e0075fee12d11': build: Add shorthand for HOSTCC compile macro Conflicts: Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions