Merge commit '7fbb3b5b9857276b4cd17b2a530c7e0880d2bc0a'

[ffmpeg] / libavformat / internal.h

diff --git a/libavformat/internal.h b/libavformat/internal.h
index dc76f2c4a7bc60a2d0af323f66fb859fce1b8587..bc6a6c2716309b86e87abe518f76acab04bfca5c 100644 (file)
--- a/libavformat/internal.h
+++ b/libavformat/internal.h
@@ -320,11 +320,6 @@ void ff_reduce_index(AVFormatContext *s, int stream_index);
 
 enum AVCodecID ff_guess_image2_codec(const char *filename);
 
-/**
- * Convert a date string in ISO8601 format to Unix timestamp.
- */
-int64_t ff_iso8601_to_unix_time(const char *datestr);
-
 /**
  * Perform a binary search using av_index_search_timestamp() and
  * AVInputFormat.read_timestamp().
@@ -565,4 +560,17 @@ void ff_format_io_close(AVFormatContext *s, AVIOContext **pb);
  */
 int ff_parse_creation_time_metadata(AVFormatContext *s, int64_t *timestamp, int return_seconds);
 
+
+#define CONTAINS_PAL 2
+/**
+ * Reshuffles the lines to use the user specified stride.
+ *
+ * @param ppkt input and output packet
+ * @return negative error code or
+ *         0 if no new packet was allocated
+ *         non-zero if a new packet was allocated and ppkt has to be freed
+ *         CONTAINS_PAL if in addition to a new packet the old contained a palette
+ */
+int ff_reshuffle_raw_rgb(AVFormatContext *s, AVPacket **ppkt, AVCodecContext *enc, int expected_stride);
+
 #endif /* AVFORMAT_INTERNAL_H */