diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2008-08-23 23:13:58 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2008-08-23 23:13:58 +0000 |
| commit | c30a4489b444020ef951c1f0583afd8679c07c78 (patch) | |
| tree | 0ca4b5260d083c6c053b8424ce213448451a0736 /libavformat | |
| parent | 0cdc6ec94130572e1da1902821e2b3cbcf0fbea8 (diff) | |
| download | ffmpeg-c30a4489b444020ef951c1f0583afd8679c07c78.tar.gz | |
export sample_aspect_ratio read by the demuxer in a separate field
that the one read by the decoder.
Originally committed as revision 14932 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 9 | ||||
| -rw-r--r-- | libavformat/utils.c | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 9c6168597b..09c465655f 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -22,7 +22,7 @@ #define FFMPEG_AVFORMAT_H #define LIBAVFORMAT_VERSION_MAJOR 52 -#define LIBAVFORMAT_VERSION_MINOR 20 +#define LIBAVFORMAT_VERSION_MINOR 21 #define LIBAVFORMAT_VERSION_MICRO 0 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ @@ -402,6 +402,13 @@ typedef struct AVStream { AVProbeData probe_data; #define MAX_REORDER_DELAY 16 int64_t pts_buffer[MAX_REORDER_DELAY+1]; + + /** + * sample aspect ratio (0 if unknown) + * - encoding: Set by user. + * - decoding: Set by libavformat. + */ + AVRational sample_aspect_ratio; } AVStream; #define AV_PROGRAM_RUNNING 1 diff --git a/libavformat/utils.c b/libavformat/utils.c index 51cad25ab9..9a8aaeca7f 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2331,6 +2331,8 @@ AVStream *av_new_stream(AVFormatContext *s, int id) for(i=0; i<MAX_REORDER_DELAY+1; i++) st->pts_buffer[i]= AV_NOPTS_VALUE; + st->sample_aspect_ratio = (AVRational){0,1}; + s->streams[s->nb_streams++] = st; return st; } |