diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-03 12:20:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-03 12:20:44 +0100 |
| commit | 0e15a344c1ce1a0e8c5331c7608d63c384e25a67 (patch) | |
| tree | bebd8b6020e0da4465748723ed7098f7a10b4b4f /libavcodec/vaapi_mpeg.c | |
| parent | 0cc5011f9a1b05132f9a20a71feb031f30a8a53b (diff) | |
| parent | 089fac77a6bf9199a5ec161e9c27850f0a680541 (diff) | |
| download | ffmpeg-0e15a344c1ce1a0e8c5331c7608d63c384e25a67.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
alsa-audio-dec: explicitly cast the delay to a signed int64
Conflicts:
libavdevice/alsa-audio-dec.c
no change as the buggy code has been replaced in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vaapi_mpeg.c')
0 files changed, 0 insertions, 0 deletions