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.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/flac.h')
-rw-r--r-- | libavcodec/flac.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/flac.h b/libavcodec/flac.h index b4f28cfcbd..d85195fff0 100644 --- a/libavcodec/flac.h +++ b/libavcodec/flac.h @@ -110,11 +110,6 @@ int avpriv_flac_is_extradata_valid(AVCodecContext *avctx, enum FLACExtradataFormat *format, uint8_t **streaminfo_start); -#if LIBAVCODEC_VERSION_MAJOR < 56 -void avpriv_flac_parse_block_header(const uint8_t *block_header, - int *last, int *type, int *size); -#endif - /** * Calculate an estimate for the maximum frame size based on verbatim mode. * @param blocksize block size, in samples |