ffmpeg | branch: release/2.2 | Michael Niedermayer <[email protected]> | Sat Dec 
20 13:15:14 2014 +0100| [c52c9f534e6aaa85c7cc0fe078512751002dfa98] | committer: 
Michael Niedermayer

Merge commit 'f249e9889155599ee3ad0172832d38f68b0c625d' into release/2.2

* commit 'f249e9889155599ee3ad0172832d38f68b0c625d':
  smc: fix the bounds check

Conflicts:
        libavcodec/smc.c

See: c727401aa9d62335e89d118a5b4e202edf39d905
Merged-by: Michael Niedermayer <[email protected]>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c52c9f534e6aaa85c7cc0fe078512751002dfa98
---



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to