diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-07 02:15:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-07 02:15:26 +0200 |
| commit | a52384dcdab26e5925a44c0f5fd4b1c5ac5920fe (patch) | |
| tree | da47c91c3ec86fe0b52297d771f613bb05b1b3f6 /libavcodec | |
| parent | d47dd84391f2a4d9dab36b375019bf05d83a5a29 (diff) | |
| parent | 153fadc390d05aa47e5e2c56290401898fe41a23 (diff) | |
Merge commit '153fadc390d05aa47e5e2c56290401898fe41a23'
* commit '153fadc390d05aa47e5e2c56290401898fe41a23':
ff_get_format: fix infinite loop
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index f1ba52cecd..7ceb2daa83 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1233,7 +1233,7 @@ int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt) do choices[n] = choices[n + 1]; - while (choices[n] != AV_PIX_FMT_NONE); + while (choices[n++] != AV_PIX_FMT_NONE); } av_freep(&choices); |