Merge commit '66f091053f11a8957b2175480d2f368d2cf4474c'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Sep 2013 10:34:09 +0000 (12:34 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Sep 2013 10:34:09 +0000 (12:34 +0200)
commit61845dc74afce9c33583eb1d0ed82c115ff61d4b
tree10df818d391286c9cfb44a87a6c65c5f3662d833
parent5866c107a9b9d936f3b5c2385a5f724c900df01d
parent66f091053f11a8957b2175480d2f368d2cf4474c
Merge commit '66f091053f11a8957b2175480d2f368d2cf4474c'

* commit '66f091053f11a8957b2175480d2f368d2cf4474c':
  mpeg12enc: drop forward declarations

Conflicts:
libavcodec/mpeg12enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg12enc.c