vc1: skip motion compensation when data for last picture is invalid

[ffmpeg] / libavcodec / mpegaudiodecheader.h

diff --git a/libavcodec/mpegaudiodecheader.h b/libavcodec/mpegaudiodecheader.h
index 764e8abde49a84eaca5d9d5deb96c6ea31214ce1..089a508c4e50262e8cdcfd4f9de5fd36c4d3d925 100644 (file)
--- a/libavcodec/mpegaudiodecheader.h
+++ b/libavcodec/mpegaudiodecheader.h
@@ -52,9 +52,14 @@ typedef struct MPADecodeHeader {
    that the frame size must be computed externally */
 int avpriv_mpegaudio_decode_header(MPADecodeHeader *s, uint32_t header);
 
-/* useful helper to get mpeg audio stream infos. Return -1 if error in
+/* useful helper to get MPEG audio stream info. Return -1 if error in
    header, otherwise the coded frame size in bytes */
+int ff_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate,
+                         int *channels, int *frame_size, int *bitrate);
+
+#if LIBAVCODEC_VERSION_MAJOR < 57
 int avpriv_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate, int *channels, int *frame_size, int *bitrate);
+#endif
 
 /* fast header check for resync */
 static inline int ff_mpa_check_header(uint32_t header){