"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "libav.h" between
minidlna-1.1.5.tar.gz and minidlna-1.2.0.tar.gz

About: ReadyMedia (formerly known as MiniDLNA) is a simple media server software, with the aim of being fully compliant with DLNA/UPnP-AV clients.

libav.h  (minidlna-1.1.5):libav.h  (minidlna-1.2.0)
skipping to change at line 60 skipping to change at line 60
#elif HAVE_LIBAVFORMAT_AVFORMAT_H #elif HAVE_LIBAVFORMAT_AVFORMAT_H
#include <libavformat/avformat.h> #include <libavformat/avformat.h>
#elif HAVE_FFMPEG_AVFORMAT_H #elif HAVE_FFMPEG_AVFORMAT_H
#include <ffmpeg/avformat.h> #include <ffmpeg/avformat.h>
#elif HAVE_LIBAV_LIBAVFORMAT_H #elif HAVE_LIBAV_LIBAVFORMAT_H
#include <libav/avformat.h> #include <libav/avformat.h>
#elif HAVE_AVFORMAT_H #elif HAVE_AVFORMAT_H
#include <avformat.h> #include <avformat.h>
#endif #endif
#define USE_CODECPAR LIBAVFORMAT_VERSION_INT >= ((57<<16)+(50<<8)+100)
#ifndef FF_PROFILE_H264_BASELINE #ifndef FF_PROFILE_H264_BASELINE
#define FF_PROFILE_H264_BASELINE 66 #define FF_PROFILE_H264_BASELINE 66
#endif #endif
#ifndef FF_PROFILE_H264_CONSTRAINED_BASELINE #ifndef FF_PROFILE_H264_CONSTRAINED_BASELINE
#define FF_PROFILE_H264_CONSTRAINED_BASELINE 578 #define FF_PROFILE_H264_CONSTRAINED_BASELINE 578
#endif #endif
#ifndef FF_PROFILE_H264_MAIN #ifndef FF_PROFILE_H264_MAIN
#define FF_PROFILE_H264_MAIN 77 #define FF_PROFILE_H264_MAIN 77
#endif #endif
#ifndef FF_PROFILE_H264_HIGH #ifndef FF_PROFILE_H264_HIGH
skipping to change at line 158 skipping to change at line 160
if (s->r_frame_rate.den) if (s->r_frame_rate.den)
return s->r_frame_rate.num / s->r_frame_rate.den; return s->r_frame_rate.num / s->r_frame_rate.den;
#else #else
if (s->avg_frame_rate.den) if (s->avg_frame_rate.den)
return s->avg_frame_rate.num / s->avg_frame_rate.den; return s->avg_frame_rate.num / s->avg_frame_rate.den;
#endif #endif
return 0; return 0;
} }
static inline int static inline int
lav_get_interlaced(AVCodecContext *vc, AVStream *s) lav_get_interlaced(AVStream *s)
{ {
#if LIBAVCODEC_VERSION_MAJOR < 54 #if LIBAVCODEC_VERSION_MAJOR >= 57
return (vc->time_base.den ? (s->r_frame_rate.num / vc->time_base.den) : 0 return (s->time_base.den ? (s->avg_frame_rate.num / s->time_base.den) : 0
); );
#elif LIBAVCODEC_VERSION_MAJOR >= 54
return (s->codec->time_base.den ? (s->avg_frame_rate.num / s->codec->time
_base.den) : 0);
#else
return (s->codec->time_base.den ? (s->r_frame_rate.num / s->codec->time_b
ase.den) : 0);
#endif
}
#if USE_CODECPAR
#define lav_codec_id(s) s->codecpar->codec_id
#define lav_codec_type(s) s->codecpar->codec_type
#define lav_codec_tag(s) s->codecpar->codec_tag
#define lav_sample_rate(s) s->codecpar->sample_rate
#define lav_bit_rate(s) s->codecpar->bit_rate
#define lav_channels(s) s->codecpar->channels
#define lav_width(s) s->codecpar->width
#define lav_height(s) s->codecpar->height
#define lav_profile(s) s->codecpar->profile
#define lav_level(s) s->codecpar->level
#define lav_sample_aspect_ratio(s) s->codecpar->sample_aspect_ratio
#else
#define lav_codec_id(x) x->codec->codec_id
#define lav_codec_type(s) s->codec->codec_type
#define lav_codec_tag(s) s->codec->codec_tag
#define lav_sample_rate(s) s->codec->sample_rate
#define lav_bit_rate(s) s->codec->bit_rate
#define lav_channels(s) s->codec->channels
#define lav_width(s) s->codec->width
#define lav_height(s) s->codec->height
#define lav_profile(s) s->codec->profile
#define lav_level(s) s->codec->level
#define lav_sample_aspect_ratio(s) s->codec->sample_aspect_ratio
#endif
static inline uint8_t *
lav_codec_extradata(AVStream *s)
{
#if USE_CODECPAR
if (!s->codecpar->extradata_size)
return NULL;
return s->codecpar->extradata;
#else #else
return (vc->time_base.den ? (s->avg_frame_rate.num / vc->time_base.den) : if (!s->codec->extradata_size)
0); return NULL;
return s->codec->extradata;
#endif #endif
} }
static inline int static inline int
lav_is_thumbnail_stream(AVStream *s, uint8_t **data, int *size) lav_is_thumbnail_stream(AVStream *s, uint8_t **data, int *size)
{ {
#if LIBAVFORMAT_VERSION_INT >= ((54<<16)+(6<<8)) #if LIBAVFORMAT_VERSION_INT >= ((54<<16)+(6<<8))
if (s->disposition & AV_DISPOSITION_ATTACHED_PIC && if (s->disposition & AV_DISPOSITION_ATTACHED_PIC &&
s->codec->codec_id == AV_CODEC_ID_MJPEG) lav_codec_id(s) == AV_CODEC_ID_MJPEG)
{ {
if (data) if (data)
*data = s->attached_pic.data; *data = s->attached_pic.data;
if (size) if (size)
*size = s->attached_pic.size; *size = s->attached_pic.size;
return 1; return 1;
} }
#endif #endif
return 0; return 0;
} }
 End of changes. 5 change blocks. 
7 lines changed or deleted 52 lines changed or added

Home  |  About  |  All  |  Newest  |  Fossies Dox  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTPS