mpjpeg: Use proper CR/LF in multipart headers

[ffmpeg] / libavformat / internal.h

diff --git a/libavformat/internal.h b/libavformat/internal.h
index bbdfd2f719c23c85b4feaeec66a0cb5696a6c99a..52cd29b9b79b5f2c2be9db6ede6950afada49561 100644 (file)
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -113,6 +113,15 @@ struct AVStreamInternal {
 
     enum AVCodecID orig_codec_id;
 
+    /* the context for extracting extradata in find_stream_info()
+     * inited=1/bsf=NULL signals that extracting is not possible (codec not
+     * supported) */
+    struct {
+        AVBSFContext *bsf;
+        AVPacket     *pkt;
+        int inited;
+    } extract_extradata;
+
 #if FF_API_LAVF_AVCTX
     // whether the deprecated stream codec context needs
     // to be filled from the codec parameters
@@ -443,12 +452,13 @@ void ff_format_io_close(AVFormatContext *s, AVIOContext **pb);
 
 /**
  * Find the next packet in the interleaving queue for the given stream.
- * The packet is not removed from the interleaving queue, but only
- * a pointer to it is returned.
+ * The pkt parameter is filled in with the queued packet, including
+ * references to the data (which the caller is not allowed to keep or
+ * modify).
  *
- * @return a pointer to the next packet, or NULL if no packet is queued
- *         for this stream.
+ * @return 0 if a packet was found, a negative value if no packet was found
  */
-const AVPacket *ff_interleaved_peek(AVFormatContext *s, int stream);
+int ff_interleaved_peek(AVFormatContext *s, int stream,
+                        AVPacket *pkt, int add_offset);
 
 #endif /* AVFORMAT_INTERNAL_H */