highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
e41bf19d2cb0e39e65f67d45a11458751a086d8c
ffmpeg/libavcodec/smacker.c
Michael Niedermayer 6c655b40ea Merge commit 'bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c' 
* commit 'bbb2945f2dfbc2306c1655bf7eb6e220912a9a7c':
  smacker: check the return value of smacker_decode_tree

Conflicts:
	libavcodec/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-17 00:36:25 +02:00

24 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink