diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-11-08 23:36:32 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-11-08 23:36:32 +0000 |
| commit | d07730ddd139e97d671c8670bdd73e19d3e9fcc0 (patch) | |
| tree | 0b34c4ed6b6f6031a77b8e126224e545e2be63e8 /libavcodec | |
| parent | 359fa0febc878066cbb31102e1ee709374054015 (diff) | |
| download | ffmpeg-d07730ddd139e97d671c8670bdd73e19d3e9fcc0.tar.gz | |
fix image stream copy
Originally committed as revision 3662 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 3 | ||||
| -rw-r--r-- | libavcodec/raw.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index ae4c6f14c1..bb62790fb2 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -17,7 +17,7 @@ extern "C" { #define FFMPEG_VERSION_INT 0x000409 #define FFMPEG_VERSION "0.4.9-pre1" -#define LIBAVCODEC_BUILD 4728 +#define LIBAVCODEC_BUILD 4729 #define LIBAVCODEC_VERSION_INT FFMPEG_VERSION_INT #define LIBAVCODEC_VERSION FFMPEG_VERSION @@ -1996,6 +1996,7 @@ void avcodec_get_chroma_sub_sample(int pix_fmt, int *h_shift, int *v_shift); const char *avcodec_get_pix_fmt_name(int pix_fmt); void avcodec_set_dimensions(AVCodecContext *s, int width, int height); enum PixelFormat avcodec_get_pix_fmt(const char* name); +unsigned int avcodec_pix_fmt_to_codec_tag(enum PixelFormat p); #define FF_LOSS_RESOLUTION 0x0001 /* loss due to resolution change */ #define FF_LOSS_DEPTH 0x0002 /* loss due to color depth change */ diff --git a/libavcodec/raw.c b/libavcodec/raw.c index 91aba460ba..9128b1d548 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -64,7 +64,7 @@ static int findPixelFormat(unsigned int fourcc) return PIX_FMT_YUV420P; } -static unsigned int findFourCC(int fmt) +unsigned int avcodec_pix_fmt_to_codec_tag(enum PixelFormat fmt) { const PixelFormatTag * tags = pixelFormatTags; while (tags->pix_fmt >= 0) { @@ -152,7 +152,7 @@ static int raw_init_encoder(AVCodecContext *avctx) avctx->coded_frame->pict_type = FF_I_TYPE; avctx->coded_frame->key_frame = 1; if(!avctx->codec_tag) - avctx->codec_tag = findFourCC(avctx->pix_fmt); + avctx->codec_tag = avcodec_pix_fmt_to_codec_tag(avctx->pix_fmt); return 0; } |