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/flac.c | |
parent | 329832d779e2c9f2a2aa97c90b6e3eb1aadb8ee8 (diff) | |
parent | 9325d88eba8038b3e2a4485e473a018410379e2d (diff) |
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/flac.c')
-rw-r--r-- | libavcodec/flac.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavcodec/flac.c b/libavcodec/flac.c index aeb276bcdc..1053491340 100644 --- a/libavcodec/flac.c +++ b/libavcodec/flac.c @@ -235,11 +235,3 @@ void avpriv_flac_parse_streaminfo(AVCodecContext *avctx, struct FLACStreaminfo * skip_bits_long(&gb, 64); /* md5 sum */ skip_bits_long(&gb, 64); /* md5 sum */ } - -#if LIBAVCODEC_VERSION_MAJOR < 56 -void avpriv_flac_parse_block_header(const uint8_t *block_header, - int *last, int *type, int *size) -{ - flac_parse_block_header(block_header, last, type, size); -} -#endif |