ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sun
Jul 26 00:18:44 2015 +0200| [a822c3bd7974469d3d86abb29c8309238b5986c5] |
committer: Michael Niedermayer
Merge commit '96dca089b19bf55293136277f5b081c56146e10e'
* commit '96dca089b19bf55293136277f5b081c56146e10e':
qsvdec: move qsv_process_data() from qsvdec_h264 to the common code
Conflicts:
libavcodec/qsvdec.c
libavcodec/qsvdec_h264.c
No change as the parser code has been removed
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a822c3bd7974469d3d86abb29c8309238b5986c5
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
