generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
72,976 Commits 24 Branches 241 Tags 173 MiB
92e79a2f7b
Commit Graph

6 Commits

Author SHA1 Message Date
James Almer
1382add59d mpjpegdec: don't try to alloc an AVIOContext when probe is guaranteed to fail 
The first check is done without the AVIOContext, so alloc it only if said check succeeds

Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-06-08 18:26:42 -03:00
Michael Niedermayer
402b18afcc Merge commit 'caf7be30b11288c498fae67be4741bfbf083d977' 
* commit 'caf7be30b11288c498fae67be4741bfbf083d977':
  mpjpgdec: free AVIOContext leak on early probe fail

Conflicts:
	libavformat/mpjpegdec.c

See: 34d278f983, this was mistakenly reimplemented, also see ffmpeg IRC log of today
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-08 22:15:28 +02:00
James Almer
34d278f983 mpjpegdec: fix memory leak in probe function 
Signed-off-by: James Almer <jamrial@gmail.com>
 2015-06-08 16:03:31 -03:00
Janne Grunau
caf7be30b1 mpjpgdec: free AVIOContext leak on early probe fail 2015-06-08 13:55:26 +02:00
Michael Niedermayer
8985e7c561 Merge commit '9b56ac74b170d12027fbc81f581a451a709f1105' 
* commit '9b56ac74b170d12027fbc81f581a451a709f1105':
  mpjpeg: Initial implementation

Conflicts:
	Changelog
	libavformat/allformats.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2015-06-08 00:44:28 +02:00
Luca Barbato
9b56ac74b1 mpjpeg: Initial implementation 
Support only streams with Content-Length.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
 2015-06-07 10:14:45 +02:00