aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice/opengl_enc_shaders.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-05-22 20:38:07 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-05-22 20:38:42 +0200
commitd5227ceff13e52eddf1fd02e0042ebc9aa628791 (patch)
treeca15b06625ef047c64caab1069ee39643df4fa8a /libavdevice/opengl_enc_shaders.h
parentd9b264bc73723ce538d72f28a4a8fb4f85af7eca (diff)
parent9c1db92ad372d4cd69e0490e691c56e4097cb193 (diff)
downloadffmpeg-d5227ceff13e52eddf1fd02e0042ebc9aa628791.tar.gz
Merge commit '9c1db92ad372d4cd69e0490e691c56e4097cb193'
* commit '9c1db92ad372d4cd69e0490e691c56e4097cb193': mpegvideo: Drop err_recognition Conflicts: libavcodec/h263dec.c libavcodec/ituh263dec.c libavcodec/mpeg4video.h libavcodec/mpeg4videodec.c libavcodec/msmpeg4dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/opengl_enc_shaders.h')
0 files changed, 0 insertions, 0 deletions