diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-14 01:46:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-14 01:46:16 +0200 |
| commit | 96e1cc3f8b6b0b5b19820609b23642bde1ee7e7c (patch) | |
| tree | 8ae6d7a413a3702a4c3953e2e7cec25c81c61def /libavcodec/qsvenc.h | |
| parent | 3edc6d1cd9ef23e809a8d814dbfb589e7e1f57fe (diff) | |
| parent | a5a6a786bfebb85c269abc25559fd71963983581 (diff) | |
Merge commit 'a5a6a786bfebb85c269abc25559fd71963983581'
* commit 'a5a6a786bfebb85c269abc25559fd71963983581':
mp3: Forward seeking errors
Conflicts:
libavformat/mp3dec.c
No change as the avio_seek() that are part of seeking in mp3 are already
checked in FFmpeg
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/qsvenc.h')
0 files changed, 0 insertions, 0 deletions