diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-26 12:50:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-26 12:50:34 +0100 |
| commit | 6fbddc80d63ddbc8974f4b2e286de20def6c201d (patch) | |
| tree | 327dd7a19fba89a54ba3333fba3545e7598d3e96 /libavcodec/libschroedinger.h | |
| parent | 13fa074173269308f5051bb1a683c9ed54ab8735 (diff) | |
| parent | e8da807537e314d74cb6d93598f1dcfb891fa655 (diff) | |
Merge commit 'e8da807537e314d74cb6d93598f1dcfb891fa655'
* commit 'e8da807537e314d74cb6d93598f1dcfb891fa655':
cmdutils: only use libavresample when it is enabled
libschroedinger: cosmetics: rename variable avccontext to avctx
vorbisenc: cosmetics: rename variable avccontext to avctx
Conflicts:
cmdutils.c
libavcodec/libschroedinger.c
libavcodec/libschroedingerenc.c
libavcodec/vorbisenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libschroedinger.h')
| -rw-r--r-- | libavcodec/libschroedinger.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/libschroedinger.h b/libavcodec/libschroedinger.h index f2e513b551..12fe57c7f1 100644 --- a/libavcodec/libschroedinger.h +++ b/libavcodec/libschroedinger.h @@ -114,7 +114,7 @@ static const struct { * Returns the video format preset matching the input video dimensions and * time base. */ -SchroVideoFormatEnum ff_get_schro_video_format_preset (AVCodecContext *avccontext); +SchroVideoFormatEnum ff_get_schro_video_format_preset (AVCodecContext *avctx); /** * Sets the Schroedinger frame format corresponding to the Schro chroma format @@ -127,7 +127,7 @@ int ff_get_schro_frame_format(SchroChromaFormat schro_chroma_fmt, * Create a Schro frame based on the dimensions and frame format * passed. Returns a pointer to a frame on success, NULL on failure. */ -SchroFrame *ff_create_schro_frame(AVCodecContext *avccontext, +SchroFrame *ff_create_schro_frame(AVCodecContext *avctx, SchroFrameFormat schro_frame_fmt); #endif /* AVCODEC_LIBSCHROEDINGER_H */ |