aboutsummaryrefslogtreecommitdiffstats
path: root/doc/build_system.txt
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-28 11:56:05 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-28 11:56:05 +0100
commit2bfcd74ad3e331e995755ac865abc370d3e544c8 (patch)
treedcdba816d1ad5f5f4687d8aa62beba0519508d21 /doc/build_system.txt
parent016c00cf68a481000f48ece6c11f622ba65e8045 (diff)
parente557584aa7df6ac9f52af7ee7e5c963437da2e2f (diff)
downloadffmpeg-2bfcd74ad3e331e995755ac865abc370d3e544c8.tar.gz
Merge commit 'e557584aa7df6ac9f52af7ee7e5c963437da2e2f'
* commit 'e557584aa7df6ac9f52af7ee7e5c963437da2e2f': mpeg12: Move Mpeg1Context declaration to the only place it is used Conflicts: libavcodec/mpeg12.h libavcodec/mpeg12dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/build_system.txt')
0 files changed, 0 insertions, 0 deletions