eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-23 23:40:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
1df64d6c46ed522e74ebf082a0ea3f0dcadc1950
ffmpeg/libavcodec/mpeg4videodec.c
Michael Niedermayer be023405a7 Merge commit 'f771b3ab5d3c0b763ee356152be550f4121babd0' 
* commit 'f771b3ab5d3c0b763ee356152be550f4121babd0':
  avidec: do not export stream_codec_tag

Conflicts:
	libavformat/avidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 16:17:42 +01:00

107 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink