highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
a176bbc873b13430c683625744cb15bd659fcd58
ffmpeg/libavcodec/options_table.h
Michael Niedermayer 4a2bcdb28b Merge commit '1761ab838c75223a6b97d8c0720d09275374c53d' 
* commit '1761ab838c75223a6b97d8c0720d09275374c53d':
  lavc: Deprecate avctx.rc_strategy

Conflicts:
	libavcodec/mpegvideo.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-07-09 01:17:49 +02:00

52 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink