diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-28 11:04:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-28 11:05:12 +0100 |
| commit | dd5123a04c67f74024128447e8ca9642241d6d45 (patch) | |
| tree | b826779137aa92bc258fed7fa318c8aa0b1e799f /libavformat/srtp.c | |
| parent | ab9ba8887705e3a1db946e7f992bd5cf411f1f04 (diff) | |
| parent | ce91b2eae6ea52fc1a7003566d26db20ca62d745 (diff) | |
| download | ffmpeg-dd5123a04c67f74024128447e8ca9642241d6d45.tar.gz | |
Merge commit 'ce91b2eae6ea52fc1a7003566d26db20ca62d745'
* commit 'ce91b2eae6ea52fc1a7003566d26db20ca62d745':
vdpau: return MAIN instead of BASELINE for H.264 CBP
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/srtp.c')
0 files changed, 0 insertions, 0 deletions