X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffmpeg%200.7%2Finclude%2Flibavcodec%2Favcodec.h;h=ef539a2a360ae5caf68c1c402d702c80a92e8d86;hb=f125bd720bf68257b9a0adbfc4ec1caef0596a2d;hp=d1a5e6655e474fbb11af99a5d73d71f927bea2c4;hpb=4f7058172b7b297e10aad63001a9f4521846b06e;p=casparcg

diff --git a/ffmpeg 0.7/include/libavcodec/avcodec.h b/ffmpeg 0.7/include/libavcodec/avcodec.h
index d1a5e6655..ef539a2a3 100644
--- a/ffmpeg 0.7/include/libavcodec/avcodec.h	
+++ b/ffmpeg 0.7/include/libavcodec/avcodec.h	
@@ -2611,7 +2611,7 @@ typedef struct AVCodecContext {
     /**
      * Audio channel layout.
      * - encoding: set by user.
-     * - decoding: set by libavcodec.
+     * - decoding: set by user, may be overwritten by libavcodec.
      */
     int64_t channel_layout;
 
@@ -2880,6 +2880,14 @@ typedef struct AVCodecContext {
      */
     enum AVAudioServiceType audio_service_type;
 
+    /**
+     * desired sample format
+     * - encoding: Not used.
+     * - decoding: Set by user.
+     * Decoder will decode to this format if it can.
+     */
+    enum AVSampleFormat request_sample_fmt;
+
     /**
      * Current statistics for PTS correction.
      * - decoding: maintained and used by libavcodec, not intended to be used by user apps
@@ -2890,13 +2898,6 @@ typedef struct AVCodecContext {
     int64_t pts_correction_last_pts;       /// PTS of the last frame
     int64_t pts_correction_last_dts;       /// DTS of the last frame
 
-    /**
-     * desired sample format
-     * - encoding: Not used.
-     * - decoding: Set by user.
-     * Decoder will decode to this format if it can.
-     */
-    enum AVSampleFormat request_sample_fmt;
 
 } AVCodecContext;
 
@@ -3228,6 +3229,11 @@ uint8_t* av_packet_new_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
 uint8_t* av_packet_get_side_data(AVPacket *pkt, enum AVPacketSideDataType type,
                                  int *size);
 
+int av_packet_merge_side_data(AVPacket *pkt);
+
+int av_packet_split_side_data(AVPacket *pkt);
+
+
 /* resample.c */
 
 struct ReSampleContext;
@@ -3385,12 +3391,16 @@ int avpicture_layout(const AVPicture* src, enum PixelFormat pix_fmt, int width,
 int avpicture_get_size(enum PixelFormat pix_fmt, int width, int height);
 void avcodec_get_chroma_sub_sample(enum PixelFormat pix_fmt, int *h_shift, int *v_shift);
 
+#if FF_API_GET_PIX_FMT_NAME
 /**
  * Return the short name for a pixel format.
  *
  * \see av_get_pix_fmt(), av_get_pix_fmt_string().
+ * @deprecated Deprecated in favor of av_get_pix_fmt_name().
  */
+attribute_deprecated
 const char *avcodec_get_pix_fmt_name(enum PixelFormat pix_fmt);
+#endif
 
 void avcodec_set_dimensions(AVCodecContext *s, int width, int height);