Merge commit '66f09105'

* commit '66f09105': mpeg12enc: drop forward declarations Conflicts: libavcodec/mpeg12enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '66f09105'
* commit '66f09105': mpeg12enc: drop forward declarations Conflicts: libavcodec/mpeg12enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
61845dc7 · Michael Niedermayer · 5866c107 · 66f09105 · 61845dc7
Commit 61845dc7 authored Sep 06, 2013 by Michael Niedermayer
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 158 additions and 163 deletions

mpeg12enc.c libavcodec/mpeg12enc.c +158 -163

No files found.
--- a/libavcodec/mpeg12enc.c
+++ b/libavcodec/mpeg12enc.c