diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 02:09:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 02:09:13 +0200 |
| commit | a71fcfad892c4c59a011556f70b998aca1139b37 (patch) | |
| tree | af961a49102589bc3e8ca8ea93d969428f1e05de /libavcodec/dv_profile.h | |
| parent | 329832d779e2c9f2a2aa97c90b6e3eb1aadb8ee8 (diff) | |
| parent | 9325d88eba8038b3e2a4485e473a018410379e2d (diff) | |
| download | ffmpeg-a71fcfad892c4c59a011556f70b998aca1139b37.tar.gz | |
Merge commit '9325d88eba8038b3e2a4485e473a018410379e2d'
* commit '9325d88eba8038b3e2a4485e473a018410379e2d':
lavc: remove obsolete and disabled avpriv functions
Conflicts:
libavcodec/dv_profile.c
libavcodec/dv_profile.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dv_profile.h')
| -rw-r--r-- | libavcodec/dv_profile.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/dv_profile.h b/libavcodec/dv_profile.h index a2ef608b57..34a1a3c645 100644 --- a/libavcodec/dv_profile.h +++ b/libavcodec/dv_profile.h @@ -59,11 +59,6 @@ typedef struct AVDVProfile { const AVDVProfile* avpriv_dv_frame_profile2(AVCodecContext* codec, const AVDVProfile *sys, const uint8_t* frame, unsigned buf_size); -#if LIBAVCODEC_VERSION_MAJOR < 56 -const AVDVProfile *avpriv_dv_frame_profile(const AVDVProfile *sys, - const uint8_t* frame, unsigned buf_size); -const AVDVProfile *avpriv_dv_codec_profile(AVCodecContext* codec); -#endif /** * Get a DV profile for the provided compressed frame. |