diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 04:09:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-06 04:09:47 +0100 |
| commit | 0d9f2f5c47a008d3077510e499d68a4e960e2c66 (patch) | |
| tree | 259a63de479dfccd0e5f777e043d73aebec16aab /.gitignore | |
| parent | 28eacd135162e34379b5c0146ad41a3601f35cd8 (diff) | |
| parent | 66499f34b56fc6a9fdef25543bd9d576fc787895 (diff) | |
| download | ffmpeg-0d9f2f5c47a008d3077510e499d68a4e960e2c66.tar.gz | |
Merge commit '66499f34b56fc6a9fdef25543bd9d576fc787895'
* commit '66499f34b56fc6a9fdef25543bd9d576fc787895':
mpegvideo: do not set current_picture_ptr in decoders
Conflicts:
libavcodec/mss2.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions