diff options
| author | Michael Niedermayer <[email protected]> | 2014-03-20 22:38:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-03-20 22:39:54 +0100 |
| commit | 4d216420bed9d02cf0989d1e986247c1cd2f36c4 (patch) | |
| tree | 9d5316d57b022fea0185f1c17eaa217a82fb51dd /ffmpeg.c | |
| parent | e98bac82e5152f492ef05deff562abb2c68ec2ca (diff) | |
| parent | 7948a51b5c3d08e1a1173442a7ff72b220def303 (diff) | |
Merge commit '7948a51b5c3d08e1a1173442a7ff72b220def303'
* commit '7948a51b5c3d08e1a1173442a7ff72b220def303':
vdpau: don't assume Picture and H264Picture are the same
Conflicts:
libavcodec/vdpau.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions