Skip to content
Snippets Groups Projects
Commit 507f2940 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '1b891d17'


* commit '1b891d17':
  avconv: fix bitrate report when writing to /dev/null
  avfilter: fix graphparser memleaks on error paths
  rawdec: remove ff_raw_read_header
  pcmdec: remove dependency from rawdec
  g722: refactor out of rawdec.c
  rawvideo: use a specific read_header

Conflicts:
	ffmpeg.c
	libavformat/Makefile
	libavformat/rawdec.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 9f36ec6a 1b891d17
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment