highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
ddb7b4435a84bcc53018eb802fec675f75d242c7
ffmpeg/libavutil/parseutils.c
Michael Niedermayer a435a03374 Merge commit '6b45f05ef5b241fd1513702119af9c30056a0ac5' 
* commit '6b45f05ef5b241fd1513702119af9c30056a0ac5':
  parseutils: fix discarding const attribute warning

Conflicts:
	libavutil/parseutils.c

See: fe87b2e79c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-12 19:12:33 +01:00

28 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink