diff options
| author | Michael Niedermayer <[email protected]> | 2013-09-06 12:34:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-09-06 12:34:09 +0200 |
| commit | 61845dc74afce9c33583eb1d0ed82c115ff61d4b (patch) | |
| tree | 10df818d391286c9cfb44a87a6c65c5f3662d833 /libavformat/avisynth.c | |
| parent | 5866c107a9b9d936f3b5c2385a5f724c900df01d (diff) | |
| parent | 66f091053f11a8957b2175480d2f368d2cf4474c (diff) | |
Merge commit '66f091053f11a8957b2175480d2f368d2cf4474c'
* commit '66f091053f11a8957b2175480d2f368d2cf4474c':
mpeg12enc: drop forward declarations
Conflicts:
libavcodec/mpeg12enc.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavformat/avisynth.c')
0 files changed, 0 insertions, 0 deletions