aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/y41pdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-12-01 13:10:48 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-12-01 13:10:48 +0100
commit5473f6258c63d21494cbd8f176b8840713150b82 (patch)
tree1206206ea4e612b3f3cffa03bc376c70278baad4 /libavcodec/y41pdec.c
parent12cd992d67d996f7283f6fb61fdbbaf759f3570a (diff)
parent3bbe63d1a45853c6b760f1ea9551668568bff7ee (diff)
downloadffmpeg-5473f6258c63d21494cbd8f176b8840713150b82.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: configure: Use headers in the check for _beginthreadex for w32threads avutil: Use a configure check to enable windows console functions avutil: Include io.h with a separate condition from windows console functions Conflicts: libavutil/log.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/y41pdec.c')
0 files changed, 0 insertions, 0 deletions