summaryrefslogtreecommitdiff
path: root/libavcodec/dxva2.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-04-17 23:36:57 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-04-17 23:43:54 +0200
commitc40798441f47341c310b38e8f329cfb943924faf (patch)
treec23fbec614c59bcf14c7377d1c6ff7abdfa34353 /libavcodec/dxva2.h
parentc96786008172f669e546ca987e7aaa3c3469be71 (diff)
parentfd0c3403f611d31b944216cfa1585a2d28f7f0da (diff)
downloadffmpeg-c40798441f47341c310b38e8f329cfb943924faf.tar.gz
Merge remote branch 'qatar/master'
* qatar/master: ac3dec: fix processing of delta bit allocation information. vc1: fix fate-vc1 after previous commit. wmv3dec: fix playback of complex WMV3 files using simple_idct. make av_dup_packet() more cautious on allocation failures make containers pass palette change in AVPacket introduce side information for AVPacket Politic commits that have not been pulled: Update regtest checksums after revision 6001dad. Replace more FFmpeg references by Libav. Replace references to ffmpeg-devel with libav-devel; fix roundup URL. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dxva2.h')
-rw-r--r--libavcodec/dxva2.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dxva2.h b/libavcodec/dxva2.h
index 5c5fe21e2f..8bb78e159c 100644
--- a/libavcodec/dxva2.h
+++ b/libavcodec/dxva2.h
@@ -60,7 +60,7 @@ struct dxva_context {
uint64_t workaround;
/**
- * Private to the FFmpeg AVHWAccel implementation
+ * Private to the Libav AVHWAccel implementation
*/
unsigned report_id;
};