diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-08-30 23:56:24 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-08-30 23:56:24 +0000 |
| commit | 0446e090b1185e9773c77adad46bd5159acc8222 (patch) | |
| tree | 04ba6c5b2e856501021a96ddc9a650cf5bf761f2 /codec-cfg.c | |
| parent | c1f2df8f53deced39e181ce8e6ef6aaa41256781 (diff) | |
| download | mpv-0446e090b1185e9773c77adad46bd5159acc8222.tar.bz2 mpv-0446e090b1185e9773c77adad46bd5159acc8222.tar.xz | |
Allow forcing of demuxers and codecs by prepending '+'
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16322 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'codec-cfg.c')
| -rw-r--r-- | codec-cfg.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/codec-cfg.c b/codec-cfg.c index 66c721013e..afa33e5626 100644 --- a/codec-cfg.c +++ b/codec-cfg.c @@ -757,19 +757,19 @@ void codecs_uninit_free() { } codecs_t *find_audio_codec(unsigned int fourcc, unsigned int *fourccmap, - codecs_t *start) + codecs_t *start, int force) { - return find_codec(fourcc, fourccmap, start, 1); + return find_codec(fourcc, fourccmap, start, 1, force); } codecs_t *find_video_codec(unsigned int fourcc, unsigned int *fourccmap, - codecs_t *start) + codecs_t *start, int force) { - return find_codec(fourcc, fourccmap, start, 0); + return find_codec(fourcc, fourccmap, start, 0, force); } codecs_t* find_codec(unsigned int fourcc,unsigned int *fourccmap, - codecs_t *start, int audioflag) + codecs_t *start, int audioflag, int force) { int i, j; codecs_t *c; @@ -806,6 +806,7 @@ codecs_t* find_codec(unsigned int fourcc,unsigned int *fourccmap, return c; } } + if (force) return c; } } return NULL; |