MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '1bd442c276e6688b43777a198cad0d7e3a92123f'

Browse Source 
* commit '1bd442c276e6688b43777a198cad0d7e3a92123f':
  nut: prioritize native tags

Conflicts:
	tests/ref/lavfi/crop
	tests/ref/lavfi/crop_scale
	tests/ref/lavfi/crop_scale_vflip
	tests/ref/lavfi/crop_vflip
	tests/ref/lavfi/null
	tests/ref/lavfi/pixdesc
	tests/ref/lavfi/pixfmts_copy
	tests/ref/lavfi/pixfmts_crop
	tests/ref/lavfi/pixfmts_hflip
	tests/ref/lavfi/pixfmts_null
	tests/ref/lavfi/pixfmts_pad
	tests/ref/lavfi/pixfmts_scale
	tests/ref/lavfi/pixfmts_vflip
	tests/ref/lavfi/scale200
	tests/ref/lavfi/scale500
	tests/ref/lavfi/vflip
	tests/ref/lavfi/vflip_crop
	tests/ref/lavfi/vflip_vflip

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-10-14 14:30:06 +02:00
commit db51c65961
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/nut.c
View File

@ -22,6 +22,7 @@
#include "libavutil/mathematics.h"
#include "libavutil/tree.h"
#include "nut.h"
#include "riff.h"
#include "internal.h"
const AVCodecTag ff_nut_subtitle_tags[] = {
@ -112,6 +113,11 @@ const AVCodecTag ff_nut_video_tags[] = {
{ AV_CODEC_ID_NONE , 0 }
};
const AVCodecTag * const ff_nut_codec_tags[] = {
ff_nut_video_tags, ff_nut_subtitle_tags,
ff_codec_bmp_tags, ff_codec_wav_tags, 0
};
void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val){
int i;
for(i=0; i<nut->avf->nb_streams; i++){

2
libavformat/nut.h
View File

@ -110,6 +110,8 @@ typedef struct NUTContext {
extern const AVCodecTag ff_nut_subtitle_tags[];
extern const AVCodecTag ff_nut_video_tags[];
extern const AVCodecTag * const ff_nut_codec_tags[];
typedef struct Dispositions {
char str[9];
int flag;

7
libavformat/nutdec.c
View File

@ -361,8 +361,8 @@ static int decode_stream_header(NUTContext *nut)
case 0:
st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
st->codec->codec_id = av_codec_get_id((const AVCodecTag * const []) {
ff_codec_bmp_tags,
ff_nut_video_tags,
ff_codec_bmp_tags,
0
},
tmp);
@ -1034,8 +1034,5 @@ AVInputFormat ff_nut_demuxer = {
.read_close = nut_read_close,
.read_seek = read_seek,
.extensions = "nut",
.codec_tag = (const AVCodecTag * const []) {
ff_codec_bmp_tags, ff_nut_video_tags, ff_codec_wav_tags,
ff_nut_subtitle_tags, 0
},
.codec_tag = ff_nut_codec_tags,
};

5
libavformat/nutenc.c
View File

@ -981,8 +981,5 @@ AVOutputFormat ff_nut_muxer = {
.write_packet = nut_write_packet,
.write_trailer = nut_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
.codec_tag = (const AVCodecTag * const []){
ff_codec_bmp_tags, ff_nut_video_tags, ff_codec_wav_tags,
ff_nut_subtitle_tags, 0
},
.codec_tag = ff_nut_codec_tags,
};