diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-12 15:55:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-12 16:01:31 +0200 |
| commit | 7da1f00e79eb2f04922a8c09d986fed178a386fe (patch) | |
| tree | 9a85f56f15a35e1513e6e255fa9f3ab915a813f3 /libavdevice/x11grab.c | |
| parent | ba77fb61f741d9ab3bd12935527556055b2ffb2e (diff) | |
| parent | c1d647b15afa69fa70f999a9ddcb98346409fb4d (diff) | |
| download | ffmpeg-7da1f00e79eb2f04922a8c09d986fed178a386fe.tar.gz | |
Merge commit 'c1d647b15afa69fa70f999a9ddcb98346409fb4d'
* commit 'c1d647b15afa69fa70f999a9ddcb98346409fb4d':
mp3: Make the seek more robust
Conflicts:
libavformat/mp3dec.c
Mostly not merged
See: b6267901c466c482b2f1af3578b0a6d88265d144 and various later commits
The bug is also not reproducable in FFmpeg
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavdevice/x11grab.c')
0 files changed, 0 insertions, 0 deletions