diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 14:30:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 14:37:53 +0100 |
| commit | 269b3c8799f446a512d8a084da5c00a3e8a3a87b (patch) | |
| tree | 76487e09972cc3e450aebfcaa6259262e88e3e45 /libavdevice/bktr.c | |
| parent | 17e47ec8be200d54aa7ef31994e1ba5ea5f32622 (diff) | |
| parent | 6c82c87dbbc0582658968eae46cfebeea90a9c5e (diff) | |
| download | ffmpeg-269b3c8799f446a512d8a084da5c00a3e8a3a87b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ac3dec: fix outptr increment.
Conflicts:
libavcodec/ac3dec.c
No change as this has been fixed in ffmpeg head already
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/bktr.c')
0 files changed, 0 insertions, 0 deletions