On 25/07/13 14:06, Diego Biurrun wrote:
> ---
>  libavformat/flvdec.c |    4 ----
>  libavformat/nutenc.c |    2 +-
>  2 files changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c
> index 2f68653..54c1b0c 100644
> --- a/libavformat/flvdec.c
> +++ b/libavformat/flvdec.c
> @@ -125,8 +125,6 @@ static int flv_same_audio_codec(AVCodecContext *acodec, 
> int flags)
>      default:
>          return acodec->codec_tag == (flv_codecid >> 
> FLV_AUDIO_CODECID_OFFSET);
>      }
> -
> -    return 0;
>  }

Those above are safer to be left.

>  static void flv_set_audio_codec(AVFormatContext *s, AVStream *astream, 
> AVCodecContext *acodec, int flv_codecid) {
> @@ -197,8 +195,6 @@ static int flv_same_video_codec(AVCodecContext *vcodec, 
> int flags)
>          default:
>              return vcodec->codec_tag == flv_codecid;
>      }
> -
> -    return 0;
>  }
>  
>  static int flv_set_video_codec(AVFormatContext *s, AVStream *vstream, int 
> flv_codecid, int read) {
> diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c
> index 7234cd9..8977e72 100644
> --- a/libavformat/nutenc.c
> +++ b/libavformat/nutenc.c
> @@ -93,7 +93,7 @@ static int find_expected_header(AVCodecContext *c, int 
> size, int key_frame,
>          header |= (bitrate_index & 1) << 9;
>  
>          return 2; //FIXME actually put the needed ones in 
> build_elision_headers()
> -        return 3; //we guess that the private bit is not set
> +        //return 3; //we guess that the private bit is not set
>  //FIXME the above assumptions should be checked, if these turn out false too 
> often something should be done
>      }
>      return 0;

This hunk is fine.


_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to