diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 12:50:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 12:55:00 +0100 |
| commit | b2e0c9dd34f5f4b75624770e6080170508c1f1f4 (patch) | |
| tree | 293e3b7741e04254a571f27eb473537c361cf4fd /libavformat/version.h | |
| parent | acbd14bc7e240e827fc3673f7ec9d610bb70103a (diff) | |
| parent | 85a5bc054c1290699ccbf5799ba6c4e2fbcc3530 (diff) | |
Merge commit '85a5bc054c1290699ccbf5799ba6c4e2fbcc3530'
* commit '85a5bc054c1290699ccbf5799ba6c4e2fbcc3530':
lavf: remove disabled FF_API_R_FRAME_RATE cruft
Conflicts:
libavformat/avformat.h
libavformat/electronicarts.c
libavformat/rawdec.c
libavformat/utils.c
libavformat/version.h
The field is in use and no semantically equivalent field is available,
thus not removed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/version.h')
| -rw-r--r-- | libavformat/version.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavformat/version.h b/libavformat/version.h index d045c11eed..6332878c9f 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -76,5 +76,4 @@ #ifndef FF_API_R_FRAME_RATE #define FF_API_R_FRAME_RATE 1 #endif - #endif /* AVFORMAT_VERSION_H */ |